From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 1 Feb 2012 17:11:35 +0000 (+0000)
Subject: -barato's byte order patch, might even help with #2130
X-Git-Tag: initial-import-from-subversion-38251~14953
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fd2436817f0466d182ac4478f1fee3f2368a81ea;p=oweals%2Fgnunet.git

-barato's byte order patch, might even help with #2130
---

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 7e6d20b15..35db82a3a 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -66,20 +66,32 @@
 
 #define GNUNET_MAX(a,b) (((a) > (b)) ? (a) : (b))
 
-/* some systems use one underscore only... */
+/* some systems use one underscore only, and mingw uses no underscore... */
 #ifndef __BYTE_ORDER
 #ifdef _BYTE_ORDER
 #define __BYTE_ORDER _BYTE_ORDER
+#else
+#ifdef BYTE_ORDER
+#define __BYTE_ORDER BYTE_ORDER
+#endif
 #endif
 #endif
 #ifndef __BIG_ENDIAN
 #ifdef _BIG_ENDIAN
 #define __BIG_ENDIAN _BIG_ENDIAN
+#else
+#ifdef BIG_ENDIAN
+#define __BIG_ENDIAN BIG_ENDIAN
+#endif
 #endif
 #endif
 #ifndef __LITTLE_ENDIAN
 #ifdef _LITTLE_ENDIAN
 #define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#else
+#ifdef LITTLE_ENDIAN
+#define __LITTLE_ENDIAN LITTLE_ENDIAN
+#endif
 #endif
 #endif
 
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index ddd40fc00..2362b160d 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -494,12 +494,14 @@ GNUNET_OS_check_helper_binary (const char *binary)
     GNUNET_free (p);
     return GNUNET_SYSERR;
   }
+#ifndef MINGW
   if (0 == getuid ())
   {
     /* as we run as root, we don't insist on SUID */
     GNUNET_free (p);
     return GNUNET_OK;
   }
+#endif
   if (0 != STAT (p, &statbuf))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p,