diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-01-25 16:36:40 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-10-16 21:16:20 +0100 |
| commit | 70087c55fffc3cbc52f550418e6b1230bbb1b3b3 (patch) | |
| tree | 4e0e6a88b133b40d607d46bded86a136a4be7e2f | |
| parent | 9904c8fe75c96cf84d8885aa95f2743c1b25ea37 (diff) | |
hw/xwin: Fix redundant declaration warnings in winmonitors.c
Include xwin-config.h so HAVE_STRLCPY and HAVE_STRNDUP are defined, so
duplicate declarations of strlcpy(), strlcat() and strndup() aren't made
by os.h
In file included from ../../include/misc.h:111:0,
from ../../include/screenint.h:51,
from ../../include/scrnintstr.h:51,
from win.h:157,
from winmonitors.c:31:
../../include/os.h:491:15: error: redundant redeclaration of ‘strlcpy’
/usr/include/string.h:86:35: note: previous declaration of ‘strlcpy’ was here
../../include/os.h:492:15: error: redundant redeclaration of ‘strlcat’
/usr/include/string.h:85:35: note: previous declaration of ‘strlcat’ was here
../../include/os.h:496:15: error: redundant redeclaration of ‘strndup’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/winmonitors.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xwin/winmonitors.c b/hw/xwin/winmonitors.c index 07532f6f5..76063d300 100644 --- a/hw/xwin/winmonitors.c +++ b/hw/xwin/winmonitors.c @@ -27,6 +27,10 @@ from The Open Group. */ +#ifdef HAVE_XWIN_CONFIG_H +#include <xwin-config.h> +#endif + #include "win.h" #include "winmonitors.h" |