Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-03 20:48:31 +00:00
Code Issues Releases Activity

make imlib2.c a C++ source, as it uses the C++ symbol 'to_real_path()'

Browse Source
This commit is contained in:
Phil Sutter 2010-01-10 22:04:15 +01:00
parent b4a73e166e
commit 081f5e1699
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -147,7 +147,7 @@ if(BUILD_NVIDIA)
endif(BUILD_NVIDIA) endif(BUILD_NVIDIA)
if(BUILD_IMLIB2) if(BUILD_IMLIB2)
set(imlib2 imlib2.c) set(imlib2 imlib2.cc)
set(optional_sources ${optional_sources} ${imlib2}) set(optional_sources ${optional_sources} ${imlib2})
endif(BUILD_IMLIB2) endif(BUILD_IMLIB2)

4
src/imlib2.c → src/imlib2.cc
View File

@ -118,9 +118,9 @@ void cimlib_deinit(void)
void cimlib_add_image(const char *args) void cimlib_add_image(const char *args)
{ {
struct image_list_s *cur = NULL; struct image_list_s *cur = NULL;
char *tmp; const char *tmp;
cur = malloc(sizeof(struct image_list_s)); cur = (struct image_list_s *)malloc(sizeof(struct image_list_s));
memset(cur, 0, sizeof(struct image_list_s)); memset(cur, 0, sizeof(struct image_list_s));
if (!sscanf(args, "%1023s", cur->name)) { if (!sscanf(args, "%1023s", cur->name)) {

8
src/imlib2.h
View File

@ -26,10 +26,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#ifdef __cplusplus
extern "C" {
#endif
void cimlib_add_image(const char *name); void cimlib_add_image(const char *name);
void cimlib_set_cache_size(long size); void cimlib_set_cache_size(long size);
void cimlib_set_cache_flush_interval(long interval); void cimlib_set_cache_flush_interval(long interval);
@ -40,8 +36,4 @@ void cimlib_cleanup(void);
void print_image_callback(struct text_object *, char *, int); void print_image_callback(struct text_object *, char *, int);
#ifdef __cplusplus
}
#endif
#endif /* _CONKY_IMBLI2_H_ */ #endif /* _CONKY_IMBLI2_H_ */