diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-09-11 16:05:43 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-09-11 16:05:43 +0000 |
| commit | b8e1a9b524f0922329c5307b0396f78a3dc2b44f (patch) | |
| tree | 03b395b992b45c80d3c02c7b2587334349ce6c16 | |
| parent | e0c41662841a34898134f6efb2222989fc816469 (diff) | |
| download | usdx-b8e1a9b524f0922329c5307b0396f78a3dc2b44f.tar.gz usdx-b8e1a9b524f0922329c5307b0396f78a3dc2b44f.tar.xz usdx-b8e1a9b524f0922329c5307b0396f78a3dc2b44f.zip | |
Define BSD changed to FreeBSD as Darwin also defines BSD
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1366 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/base/UCommon.pas | 8 | ||||
| -rw-r--r-- | src/screens/UScreenOptionsGraphics.pas | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/base/UCommon.pas b/src/base/UCommon.pas index 54c54760..38a68d84 100644 --- a/src/base/UCommon.pas +++ b/src/base/UCommon.pas @@ -81,7 +81,7 @@ uses // data used by the ...Locale() functions -{$IF Defined(LINUX) or Defined(BSD)} +{$IF Defined(Linux) or Defined(FreeBSD)} var PrevNumLocale: string; @@ -111,7 +111,7 @@ function setlocale(category: integer; locale: pchar): pchar; cdecl; external 'c' // for each call to projectM instead of changing it globally. procedure SetDefaultNumericLocale(); begin - {$IF Defined(LINUX) or Defined(BSD)} + {$IF Defined(LINUX) or Defined(FreeBSD)} PrevNumLocale := setlocale(LC_NUMERIC, nil); setlocale(LC_NUMERIC, 'C'); {$IFEND} @@ -119,7 +119,7 @@ end; procedure RestoreNumericLocale(); begin - {$IF Defined(LINUX) or Defined(BSD)} + {$IF Defined(LINUX) or Defined(FreeBSD)} setlocale(LC_NUMERIC, PChar(PrevNumLocale)); {$IFEND} end; @@ -275,7 +275,7 @@ var FilePath, LocalFileName: string; SearchInfo: TSearchRec; begin -{$IF Defined(LINUX) or Defined(BSD)} +{$IF Defined(Linux) or Defined(FreeBSD)} // speed up standard case if FileExists(FileName) then begin diff --git a/src/screens/UScreenOptionsGraphics.pas b/src/screens/UScreenOptionsGraphics.pas index 66c46b0f..e2d72886 100644 --- a/src/screens/UScreenOptionsGraphics.pas +++ b/src/screens/UScreenOptionsGraphics.pas @@ -64,7 +64,7 @@ begin // FIXME: changing the video mode does not work this way in windows // and MacOSX as all textures will be invalidated through this. // See the ALT+TAB code too. - {$IF Defined(Linux) or Defined(BSD)} + {$IF Defined(Linux) or Defined(FreeBSD)} Reinitialize3D(); {$IFEND} FadeTo(@ScreenOptions); |