jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

win32: fix redefine symbol

Browse Source 
PJ_SIP defines WIN32_LEAN_AND_MEAN since 3876.
If we not force it to 1, this causes lot of redefinition
warning at build.

Change-Id: If72f0260bf15ce002cd922b875a0e816c6eb3ea2
Tuleap: #487
This commit is contained in:
Edric Milaret
2016-03-21 11:51:22 -04:00
committed by Guillaume Roguez
parent 4d5d783acf
commit 67d1d2c7d5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -74,7 +74,7 @@ case "${host_os}" in
AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.])
AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.])
AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of <windows.h>.])
AC_DEFINE([WIN32_LEAN_AND_MEAN],[1], [Define to limit the scope of <windows.h>.])
CPPFLAGS+="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__USE_MINGW_ANSI_STDIO=1"
LDFLAGS+="-no-undefined -avoid-version -Wl,--nxcompat -Wl,--dynamicbase"

4
src/winsyslog.h
View File

@ -13,7 +13,9 @@
#ifndef WINSYSLOG_H
#define WINSYSLOG_H
#define WIN32_LEAN_AND_MEAN
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#include <windows.h>
#define WINLOG_PRIMASK 0x07