[svn] GnuPG - r5034 - in trunk: artwork jnlib

[svn author wk]

Author: wk
Date: 2009-06-04 16:19:21 +0200 (Thu, 04 Jun 2009)
New Revision: 5034

Added:
   trunk/artwork/gnupg-logo-new-single.svg
Modified:
   trunk/jnlib/ChangeLog
   trunk/jnlib/mischelp.h
Log:
Define SUN_LEN also for W32.


Modified: trunk/jnlib/ChangeLog
===================================================================
--- trunk/jnlib/ChangeLog	2009-06-03 17:24:24 UTC (rev 5033)
+++ trunk/jnlib/ChangeLog	2009-06-04 14:19:21 UTC (rev 5034)
@@ -1,3 +1,7 @@
+2009-06-04  Werner Koch  <wk at g10code.com>
+
+	* mischelp.h: Include SUN_LEN etc also for W32.
+
 2009-05-19  Werner Koch  <wk at g10code.com>
 
 	* mischelp.h: Define PF_LOCAL, AF_LOCAL and SUN_LEN if requested.

Modified: trunk/jnlib/mischelp.h
===================================================================
--- trunk/jnlib/mischelp.h	2009-06-03 17:24:24 UTC (rev 5033)
+++ trunk/jnlib/mischelp.h	2009-06-04 14:19:21 UTC (rev 5034)
@@ -61,9 +61,13 @@
 
 
 /* Include hacks which are mainly required for Slowaris.  */
-#if defined(JNLIB_NEED_AFLOCAL) && !defined(HAVE_W32_SYSTEM)
-#include <sys/socket.h>
-#include <sys/un.h>
+#ifdef JNLIB_NEED_AFLOCAL
+#ifndef HAVE_W32_SYSTEM
+# include <sys/socket.h>
+# include <sys/un.h>
+#else
+# include <windows.h>
+#endif
 
 #ifndef PF_LOCAL
 # ifdef PF_UNIX
@@ -88,7 +92,7 @@
 # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
 	               + strlen ((ptr)->sun_path))
 #endif /*SUN_LEN*/
-#endif /*JNLIB_NEED_AFLOCAL && !HAVE_W32_SYSTEM*/
+#endif /*JNLIB_NEED_AFLOCAL*/
 
 
 #endif /*LIBJNLIB_MISCHELP_H*/