Removed the need to define {v,}wprintf in utils.h.

diff --git a/common/Makefile.am b/common/Makefile.am
index 8030f442516dbcff76ace00395141cedd8560a69..2c6b0b72e6f7ca6928036dce938a74c52f7c1bd4 100644 (file)
--- 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 d82f3c3cd47b4952085127f16ef8366aee87fe9a..49fb11bdc42b72e2219d2d446775dd12b76a5e0e 100644 (file)
--- a/common/utils.c
+++ b/common/utils.c
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <netinet/in.h>
+#include <alloca.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 9d8f77c7eba26caa2f1987b7de32c2514b0fe9e3..1ff686c9dc23fde7e1c4fc0c3e061e9df7c0b1f5 100644 (file)
--- 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 551ed5ccbe63a065ac65f479c7616b043a01e360..58d1c6c21721e3088c5838808ad652d8390ac142 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -30,6 +30,7 @@
 #include <sys/wait.h>
 #include <stdarg.h>
 #include <fcntl.h>
+#include <sys/select.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/include/utils.h b/include/utils.h
index 1c634d81529f4bf382f1e7a4ce5834de7b45f7c0..e9336cdd10b074ea607d82cc5d3e712143d090c5 100644 (file)
--- 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__)