diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13c6a854..d2303d61 100644 --- 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 b/src/conky-imlib2.cc similarity index 99% rename from src/imlib2.cc rename to src/conky-imlib2.cc index 094196ea..c898498b 100644 --- a/src/imlib2.cc +++ b/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 b/src/conky-imlib2.h similarity index 100% rename from src/imlib2.h rename to src/conky-imlib2.h diff --git a/src/conky.cc b/src/conky.cc index 3d15f0f2..37b41de3 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -66,7 +66,7 @@ #include #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 index cabd0327..ad69e21c 100644 --- 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 index 044fecf0..b22d73cd 100644 --- 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 index 76307da0..3c388eaa 100644 --- 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 diff --git a/src/x11.cc b/src/x11.cc index 9850b082..f3c1bb3b 100644 --- a/src/x11.cc +++ b/src/x11.cc @@ -55,7 +55,7 @@ #include #ifdef BUILD_IMLIB2 -#include "imlib2.h" +#include "conky-imlib2.h" #endif /* BUILD_IMLIB2 */ #ifndef OWN_WINDOW #include