Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 11:55:20 +00:00
Code Issues Releases Activity

Fix naming conflict for Imlib2.h

Browse Source
This commit is contained in:
Brenden Matthews 2024-03-05 14:26:05 -05:00
parent 4119af0ffe
commit 8efb3f0e0e
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -299,7 +299,7 @@ if(BUILD_NVIDIA)
endif(BUILD_NVIDIA) endif(BUILD_NVIDIA)
if(BUILD_IMLIB2) if(BUILD_IMLIB2)
set(imlib2 imlib2.cc imlib2.h) set(imlib2 conky-imlib2.cc conky-imlib2.h)
set(optional_sources ${optional_sources} ${imlib2}) set(optional_sources ${optional_sources} ${imlib2})
endif(BUILD_IMLIB2) endif(BUILD_IMLIB2)

2
src/imlib2.cc → src/conky-imlib2.cc
View File

@ -21,7 +21,7 @@
* *
*/ */
#include "imlib2.h" #include "conky-imlib2.h"
#include "config.h" #include "config.h"
#include "conky.h" #include "conky.h"
#include "logging.h" #include "logging.h"

0
src/imlib2.h → src/conky-imlib2.h
View File

2
src/conky.cc
View File

@ -66,7 +66,7 @@
#include <X11/extensions/Xdamage.h> #include <X11/extensions/Xdamage.h>
#endif #endif
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "conky-imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
#ifdef BUILD_NCURSES #ifdef BUILD_NCURSES

2
src/core.cc
View File

@ -42,7 +42,7 @@
#include "misc.h" #include "misc.h"
#include "text_object.h" #include "text_object.h"
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "conky-imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#include "proc.h" #include "proc.h"
#ifdef BUILD_MYSQL #ifdef BUILD_MYSQL

2
src/display-x11.cc
View File

@ -41,7 +41,7 @@
#endif /* BUILD_XDAMAGE */ #endif /* BUILD_XDAMAGE */
#include "fonts.h" #include "fonts.h"
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "conky-imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#ifdef BUILD_MOUSE_EVENTS #ifdef BUILD_MOUSE_EVENTS
#include "mouse-events.h" #include "mouse-events.h"

2
src/gui.cc
View File

@ -35,7 +35,7 @@
#include "wl.h" #include "wl.h"
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "conky-imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#ifndef OWN_WINDOW #ifndef OWN_WINDOW
#include <iostream> #include <iostream>

2
src/x11.cc
View File

@ -55,7 +55,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "conky-imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#ifndef OWN_WINDOW #ifndef OWN_WINDOW
#include <iostream> #include <iostream>