Revert "Replace LL_X11 and LL_FLTK to LL_LINUX"

4 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 957bd6a4d3..75875551f4 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -41,7 +41,7 @@
 # include "llfilepicker.h"
 #endif
 
-#ifdef LL_LINUX
+#ifdef LL_FLTK
   #include "FL/Fl.H"
   #include "FL/Fl_Native_File_Chooser.H"
 #endif
@@ -197,7 +197,7 @@ LLDirPicker::LLDirPicker() :
     mFileName(NULL),
     mLocked(false)
 {
-#ifndef LL_LINUX
+#ifndef LL_FLTK
     mFilePicker = new LLFilePicker();
 #endif
     reset();
@@ -205,7 +205,7 @@ LLDirPicker::LLDirPicker() :
 
 LLDirPicker::~LLDirPicker()
 {
-#ifndef LL_LINUX
+#ifndef LL_FLTK
     delete mFilePicker;
 #endif
 }
@@ -213,7 +213,7 @@ LLDirPicker::~LLDirPicker()
 
 void LLDirPicker::reset()
 {
-#ifndef LL_LINUX
+#ifndef LL_FLTK
     if (mFilePicker)
         mFilePicker->reset();
 #else
@@ -231,7 +231,7 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
         return FALSE;
     }
 
-#ifdef LL_LINUX
+#ifdef LL_FLTK
     gViewerWindow->getWindow()->beforeDialog();
     Fl_Native_File_Chooser flDlg;
     flDlg.title(LLTrans::getString("choose_the_directory").c_str());
@@ -254,7 +254,7 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
 
 std::string LLDirPicker::getDirName()
 {
-#ifndef LL_LINUX
+#ifndef LL_FLTK
     if (mFilePicker)
     {
         return mFilePicker->getFirstFile();
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 5a3316d500..bcc7792c1a 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -80,7 +80,7 @@ private:
 
 #if LL_LINUX || LL_DARWIN
     // On Linux we just implement LLDirPicker on top of LLFilePicker
-#ifndef LL_LINUX
+#ifndef LL_FLTK
     LLFilePicker *mFilePicker;
 #endif
 #endif
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 5be987f92a..d6f3727643 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
 
-#ifdef LL_LINUX
+#ifdef LL_FLTK
   #include "FL/Fl.H"
   #include "FL/Fl_Native_File_Chooser.H"
 #endif
@@ -1101,7 +1101,7 @@ BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
 
 #elif LL_LINUX
 
-#if LL_LINUX
+#if LL_FLTK
 
 BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
                                        const std::string& filename,
@@ -1410,7 +1410,7 @@ BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
     return FALSE;
 }
 
-#endif // LL_LINUX
+#endif // LL_FLTK
 
 #else // not implemented
 
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index ddf3d7ca16..1ca4137ac6 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -172,7 +172,7 @@ private:
                                  void *userdata);
 #endif
 
-#if LL_LINUX
+#if LL_FLTK
     enum EType
     {
      eSaveFile, eOpenFile, eOpenMultiple