summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
authorAiraYumi <aira.youme@airanyumi.net>2024-06-13 10:39:05 +0900
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-14 19:32:20 +0300
commitc4fc76efefd12c7cb1224dc8a748da2958f4a7f0 (patch)
tree359f25aa46d16b04ce679deeda959cc5654aeb59 /indra/llwindow/llwindowsdl.h
parentc10e785e338aa63165c614d926ce882f4f116716 (diff)
Revert "Replace LL_X11 and LL_FLTK to LL_LINUX"
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r--indra/llwindow/llwindowsdl.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 44b031b703..d24739cbda 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -35,7 +35,7 @@
#include "SDL2/SDL.h"
#include "SDL2/SDL_endian.h"
-#if LL_LINUX
+#if LL_X11
// get X11-specific headers for use in low-level stuff like copy-and-paste support
#include "SDL2/SDL_syswm.h"
#endif
@@ -184,7 +184,7 @@ public:
// Not great that these are public, but they have to be accessible
// by non-class code and it's better than making them global.
-#if LL_LINUX
+#if LL_X11
Window mSDL_XWindowID;
Display *mSDL_Display;
#endif
@@ -193,13 +193,13 @@ public:
void (*Unlock_Display)(void);
-#if LL_LINUX
+#if LL_X11
static Window get_SDL_XWindowID(void);
static Display *get_SDL_Display(void);
-#endif // LL_LINUX
+#endif // LL_X11
void *createSharedContext() override;
@@ -282,20 +282,20 @@ protected:
friend class LLWindowManager;
private:
-#if LL_LINUX
+#if LL_X11
void x11_set_urgent(BOOL urgent);
BOOL mFlashing;
LLTimer mFlashTimer;
-#endif //LL_LINUX
+#endif //LL_X11
U32 mKeyVirtualKey;
U32 mKeyModifiers;
std::string mInputType;
public:
-#if LL_LINUX
+#if LL_X11
static Display *getSDLDisplay();