From c4fc76efefd12c7cb1224dc8a748da2958f4a7f0 Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Thu, 13 Jun 2024 10:39:05 +0900 Subject: Revert "Replace LL_X11 and LL_FLTK to LL_LINUX" --- indra/llwindow/llwindowsdl.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/llwindow/llwindowsdl.h') 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(); -- cgit v1.2.3