mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-27 04:32:55 +00:00
move the ncurses.h include from conky.h to core.c
Fixes some namespace error with libmpdclient.c.
This commit is contained in:
parent
ff199355f6
commit
12ab00cd2e
@ -127,10 +127,6 @@ char *strndup(const char *s, size_t n);
|
|||||||
#include "apcupsd.h"
|
#include "apcupsd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NCURSES
|
|
||||||
#include <ncurses.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* sony support */
|
/* sony support */
|
||||||
#include "sony.h"
|
#include "sony.h"
|
||||||
|
|
||||||
|
@ -65,6 +65,10 @@
|
|||||||
#ifdef HAVE_ICONV
|
#ifdef HAVE_ICONV
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
|
|
||||||
|
#ifdef NCURSES
|
||||||
|
#include <ncurses.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ICONV_CODEPAGE_LENGTH 20
|
#define ICONV_CODEPAGE_LENGTH 20
|
||||||
|
|
||||||
int register_iconv(iconv_t *new_iconv);
|
int register_iconv(iconv_t *new_iconv);
|
||||||
|
Loading…
Reference in New Issue
Block a user