From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 4 Mar 2014 11:23:03 +0000 (+0100)
Subject: Changes to account for the reduced included gnulib
X-Git-Tag: gnutls_3_3_0pre0~85
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a7383a87eb614f520275c9831587cdbab350dbbb;p=thirdparty%2Fgnutls.git

Changes to account for the reduced included gnulib
---

diff --git a/lib/fips.c b/lib/fips.c
index f0848b50a4..4b383d274a 100644
--- a/lib/fips.c
+++ b/lib/fips.c
@@ -27,11 +27,12 @@
 #include <fips.h>
 #include <stdio.h>
 #include <random.h>
-#include <dlfcn.h>
 
 unsigned int _gnutls_lib_mode = LIB_STATE_POWERON;
 #ifdef ENABLE_FIPS140
 
+#include <dlfcn.h>
+
 #define FIPS_KERNEL_FILE "/proc/sys/crypto/fips_enabled"
 #define FIPS_SYSTEM_FILE "/etc/system-fips"
 
diff --git a/lib/system.c b/lib/system.c
index 4aacb32d08..31a9aab156 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -26,33 +26,35 @@
 #include <gnutls_errors.h>
 
 #include <sys/socket.h>
-#include <sys/select.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <c-ctype.h>
 
 #ifdef _WIN32
-#include <windows.h>
-#include <wincrypt.h>
-#if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
+# include <windows.h>
+# include <wincrypt.h>
+# if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
 typedef PCCRL_CONTEXT WINAPI(*Type_CertEnumCRLsInStore) (HCERTSTORE
 							 hCertStore,
 							 PCCRL_CONTEXT
 							 pPrevCrlContext);
 static Type_CertEnumCRLsInStore Loaded_CertEnumCRLsInStore;
 static HMODULE Crypt32_dll;
-#else
-#define Loaded_CertEnumCRLsInStore CertEnumCRLsInStore
-#endif
-#else
-#ifdef HAVE_PTHREAD_LOCKS
-#include <pthread.h>
-#endif
+# else
+#  define Loaded_CertEnumCRLsInStore CertEnumCRLsInStore
+# endif
 
-#if defined(HAVE_GETPWUID_R)
-#include <pwd.h>
-#endif
+#else /* _WIN32 */
+# include <sys/select.h>
+
+# ifdef HAVE_PTHREAD_LOCKS
+#  include <pthread.h>
+# endif
+
+# if defined(HAVE_GETPWUID_R)
+#  include <pwd.h>
+# endif
 #endif
 
 /* System specific function wrappers.