summaryrefslogtreecommitdiffstats
path: root/jnlib
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-12-15 15:15:54 +0100
committerWerner Koch <wk@gnupg.org>2004-12-15 15:15:54 +0100
commit69967b04125e53811182a01d2700984469117339 (patch)
tree3034ccf72b4bb558187f3e1d435a92ec193e093c /jnlib
parentYep. No lost threads anymore. (diff)
downloadgnupg2-69967b04125e53811182a01d2700984469117339.tar.xz
gnupg2-69967b04125e53811182a01d2700984469117339.zip
A whole bunch of changes to allow building for W32.
Diffstat (limited to 'jnlib')
-rw-r--r--jnlib/ChangeLog4
-rw-r--r--jnlib/logging.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 2eaa7916f..71512715b 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15 Werner Koch <wk@g10code.com>
+
+ * logging.c [W32]: Don't include unavailable headers.
+
2004-12-14 Werner Koch <wk@g10code.com>
* w32-pth.c (_pth_strerror): Renamed to ...
diff --git a/jnlib/logging.c b/jnlib/logging.c
index 960d816eb..781f03e6d 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -35,16 +35,13 @@
#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifndef _WIN32
+#ifndef HAVE_W32_SYSTEM
#include <sys/socket.h>
#include <sys/un.h>
-#endif
+#endif /*!HAVE_W32_SYSTEM*/
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
-#ifdef __MINGW32__
-# include <io.h>
-#endif
#define JNLIB_NEED_LOG_LOGV 1