6 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 60b48de70d..5922130266 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -263,7 +263,7 @@ using namespace LL;
 // define a self-registering event API object
 #include "llappviewerlistener.h"
 
-#if (LL_LINUX || LL_FREEBSD) && LL_GTK
+#if (LL_LINUX || __FreeBSD__) && LL_GTK
 #include "glib.h"
 #endif // (LL_LINUX) && LL_GTK
 
@@ -309,7 +309,7 @@ S32 gLastExecDuration = -1; // (<0 indicates unknown)
 #   define LL_PLATFORM_KEY "mac"
 #elif LL_LINUX
 #   define LL_PLATFORM_KEY "lnx"
-#elif LL_FREEBSD
+#elif __FreeBSD__
 #   define LL_PLATFORM_KEY "bsd"
 #else
 #   error "Unknown Platform"
@@ -887,7 +887,7 @@ bool LLAppViewer::init()
     std::string mime_types_name;
 #if LL_DARWIN
     mime_types_name = "mime_types_mac.xml";
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
     mime_types_name = "mime_types_linux.xml";
 #else
     mime_types_name = "mime_types.xml";
@@ -1729,7 +1729,7 @@ bool LLAppViewer::cleanup()
     // one because it happens just after mFastTimerLogThread is deleted. This
     // comment is in case we guessed wrong, so we can move it here instead.
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
     // remove any old breakpad minidump files from the log directory
     if (! isError())
     {
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 94fb5fefe5..8c2181292f 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -37,7 +37,7 @@
 #include "llviewercontrol.h"
 #include "llwin32headerslean.h"
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
 # include "llfilepicker.h"
 #endif
 
@@ -187,7 +187,7 @@ std::string LLDirPicker::getDirName()
     return mFilePicker->getFirstFile();
 }
 
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 
 LLDirPicker::LLDirPicker() :
     mFileName(NULL),
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 814e27af45..82adbcce11 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -78,7 +78,7 @@ private:
     void buildDirname( void );
     bool check_local_file_access_enabled();
 
-#if LL_LINUX || LL_DARWIN || LL_FREEBSD
+#if LL_LINUX || LL_DARWIN || __FreeBSD__
     // On Linux we just implement LLDirPicker on top of LLFilePicker
     LLFilePicker *mFilePicker;
 #endif
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 6fb68b91f3..a900e6e1ca 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -62,7 +62,7 @@
 
 #if LL_DARWIN
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
 #else
 const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 0ae0d870e5..e659a55abe 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -40,7 +40,7 @@
 #include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
 #endif // LL_SDL
 
-#if LL_LINUX || LL_FREEBSD
+#if LL_LINUX || __FreeBSD__
 #include "llhttpconstants.h"    // file picker uses some of thes constants on Linux
 #endif
 
@@ -1093,7 +1093,7 @@ BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
 }
 //END LL_DARWIN
 
-#elif LL_LINUX || LL_FREEBSD
+#elif LL_LINUX || __FreeBSD__
 
 # if LL_GTK
 
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index fa1f3c3ab0..a7ce549bdf 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -56,7 +56,7 @@
 #include "llmatrix4a.h"
 #include "llperfstats.h"
 
-#if !LL_DARWIN && !LL_LINUX && !LL_FREEBSD
+#if !LL_DARWIN && !LL_LINUX && !__FreeBSD__
 extern PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB;
 extern PFNGLWEIGHTFVARBPROC glWeightfvARB;
 extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB;