Fix naming conflict for Imlib2.h

brndnmtthws · Mar 5, 2024 · 36f0322 · 36f0322
1 parent e520731
commit 36f0322
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -299,7 +299,7 @@ if(BUILD_NVIDIA)
 endif(BUILD_NVIDIA)
 
 if(BUILD_IMLIB2)
-  set(imlib2 imlib2.cc imlib2.h)
+  set(imlib2 conky-imlib2.cc conky-imlib2.h)
   set(optional_sources ${optional_sources} ${imlib2})
 endif(BUILD_IMLIB2)
 

diff --git a/src/imlib2.cc → src/conky-imlib2.cc b/src/imlib2.cc → src/conky-imlib2.cc
@@ -21,7 +21,7 @@
  *
  */
 
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #include "config.h"
 #include "conky.h"
 #include "logging.h"

diff --git a/src/imlib2.h → src/conky-imlib2.h b/src/imlib2.h → src/conky-imlib2.h
diff --git a/src/conky.cc b/src/conky.cc
@@ -66,7 +66,7 @@
 #include <X11/extensions/Xdamage.h>
 #endif
 #ifdef BUILD_IMLIB2
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #endif /* BUILD_X11 */
 #ifdef BUILD_NCURSES

diff --git a/src/core.cc b/src/core.cc
@@ -42,7 +42,7 @@
 #include "misc.h"
 #include "text_object.h"
 #ifdef BUILD_IMLIB2
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #include "proc.h"
 #ifdef BUILD_MYSQL

diff --git a/src/display-x11.cc b/src/display-x11.cc
@@ -41,7 +41,7 @@
 #endif /* BUILD_XDAMAGE */
 #include "fonts.h"
 #ifdef BUILD_IMLIB2
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #ifdef BUILD_MOUSE_EVENTS
 #include "mouse-events.h"

diff --git a/src/gui.cc b/src/gui.cc
@@ -35,7 +35,7 @@
 #include "wl.h"
 
 #ifdef BUILD_IMLIB2
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #ifndef OWN_WINDOW
 #include <iostream>

diff --git a/src/x11.cc b/src/x11.cc
@@ -55,7 +55,7 @@
 #include <X11/Xutil.h>
 
 #ifdef BUILD_IMLIB2
-#include "imlib2.h"
+#include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #ifndef OWN_WINDOW
 #include <iostream>