projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff19935
)
move the ncurses.h include from conky.h to core.c
author
Phil Sutter
<phil@nwl.cc>
Thu, 3 Sep 2009 22:08:40 +0000
(
00:08
+0200)
committer
Phil Sutter
<phil@nwl.cc>
Thu, 3 Sep 2009 22:08:57 +0000
(
00:08
+0200)
Fixes some namespace error with libmpdclient.c.
src/conky.h
patch
|
blob
|
history
src/core.c
patch
|
blob
|
history
diff --git
a/src/conky.h
b/src/conky.h
index
7e841c5
..
8428899
100644
(file)
--- a/
src/conky.h
+++ b/
src/conky.h
@@
-127,10
+127,6
@@
char *strndup(const char *s, size_t n);
#include "apcupsd.h"
#endif
-#ifdef NCURSES
-#include <ncurses.h>
-#endif
-
/* sony support */
#include "sony.h"
diff --git
a/src/core.c
b/src/core.c
index
bfc636e
..
b21bcf7
100644
(file)
--- a/
src/core.c
+++ b/
src/core.c
@@
-65,6
+65,10
@@
#ifdef HAVE_ICONV
#include <iconv.h>
+#ifdef NCURSES
+#include <ncurses.h>
+#endif
+
#define ICONV_CODEPAGE_LENGTH 20
int register_iconv(iconv_t *new_iconv);