The two patches fix warnings with gcc -Wundef.

Regards, Tim
From 6dfe2d900821bf171ff2a5eff471d69727efc6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim Rühsen?= <[email protected]>
Date: Sat, 7 Jan 2017 16:29:36 +0100
Subject: [PATCH 1/2] Avoid warning about undefined __USE_FILE_OFFSET64

* lib/glob-libc.h: Check if __USE_FILE_OFFSET64 is defined
---
 lib/glob-libc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/glob-libc.h b/lib/glob-libc.h
index 6fb271a1e..d54043144 100644
--- a/lib/glob-libc.h
+++ b/lib/glob-libc.h
@@ -158,7 +158,7 @@ typedef struct
   } glob64_t;
 #endif

-#if __USE_FILE_OFFSET64 && __GNUC__ < 2 && !defined __GLOB_GNULIB
+#if defined __USE_FILE_OFFSET64 && __GNUC__ < 2 && !defined __GLOB_GNULIB
 # define glob glob64
 # define globfree globfree64
 #endif
--
2.11.0

>From 5ca9ff49771c178f0d70a660d80ee74fe9b938c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim Rühsen?= <[email protected]>
Date: Sat, 7 Jan 2017 16:32:47 +0100
Subject: [PATCH 2/2] Avoid warning about undefined WINDOWS_SOCKETS

* lib/sockets.h: Check if WINDOWS_SOCKETS is defined
---
 lib/sockets.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/sockets.h b/lib/sockets.h
index da894b81c..8392e5756 100644
--- a/lib/sockets.h
+++ b/lib/sockets.h
@@ -27,13 +27,13 @@
 #define SOCKETS_2_2 0x0202

 int gl_sockets_startup (int version)
-#if !WINDOWS_SOCKETS
+#ifndef WINDOWS_SOCKETS
   _GL_ATTRIBUTE_CONST
 #endif
   ;

 int gl_sockets_cleanup (void)
-#if !WINDOWS_SOCKETS
+#ifndef WINDOWS_SOCKETS
   _GL_ATTRIBUTE_CONST
 #endif
   ;
@@ -41,7 +41,7 @@ int gl_sockets_cleanup (void)
 /* This function is useful it you create a socket using gnulib's
    Winsock wrappers but needs to pass on the socket handle to some
    other library that only accepts sockets. */
-#if WINDOWS_SOCKETS
+#ifdef WINDOWS_SOCKETS

 #include <sys/socket.h>

--
2.11.0

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to