From: Fredrik Tolf Date: Wed, 31 Oct 2007 05:00:03 +0000 (+0100) Subject: Merge branch 'master' of pc18:/srv/git/r/doldaconnect X-Git-Tag: 1.1~46 X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=139620be0f4f1e9e1650e5cd9583e0564cb1cd11;hp=33fede625f6a0eac733155b0276bf1b165068051;p=doldaconnect.git Merge branch 'master' of pc18:/srv/git/r/doldaconnect --- diff --git a/common/Makefile.am b/common/Makefile.am index 8030f44..2c6b0b7 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -11,6 +11,7 @@ libhttp_a_SOURCES = http.c httest_SOURCES = httest.c httest_LDADD = libhttp.a libcommon.a +libcommon_a_CPPFLAGS = -D_ISOC99_SOURCE libcommon_a_CFLAGS = -fPIC libhttp_a_CFLAGS = -fPIC diff --git a/common/utils.c b/common/utils.c index d82f3c3..49fb11b 100644 --- a/common/utils.c +++ b/common/utils.c @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9d8f77c..1ff686c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -30,4 +30,4 @@ doldacond_SOURCES= main.c \ EXTRA_DIST=emacs-local doldacond_LDADD=$(top_srcdir)/common/libcommon.a \ @KRB5_LIBS@ -lbz2 -lz -lgdbm @PAM_LIBS@ @KEYUTILS_LIBS@ -doldacond_CPPFLAGS=-I$(top_srcdir)/include -DDAEMON @KRB5_CFLAGS@ +doldacond_CPPFLAGS=-I$(top_srcdir)/include -DDAEMON @KRB5_CFLAGS@ -D_ISOC99_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE diff --git a/daemon/main.c b/daemon/main.c index 551ed5c..58d1c6c 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -30,6 +30,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include diff --git a/include/utils.h b/include/utils.h index 1c634d8..e9336cd 100644 --- a/include/utils.h +++ b/include/utils.h @@ -70,12 +70,6 @@ extern struct cbchain_ ## name { \ void *data; \ } * name -extern int vswprintf (wchar_t *__restrict __s, size_t __n, - __const wchar_t *__restrict __format, - __gnuc_va_list __arg); -extern int swprintf (wchar_t *__restrict __s, size_t __n, - __const wchar_t *__restrict __format, ...); - char *vsprintf2(char *format, va_list al); char *sprintf2(char *format, ...) #if defined(__GNUC__)