Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 17 insertions, 18 deletions

diff --git a/openssl/crypto/uid.c b/openssl/crypto/uid.c
index b1fd52bad..90694c672 100644
--- a/openssl/crypto/uid.c
+++ b/openssl/crypto/uid.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -58,32 +58,31 @@
 
 #if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2)
 
-#include OPENSSL_UNISTD
+# include OPENSSL_UNISTD
 
 int OPENSSL_issetugid(void)
-	{
-	return issetugid();
-	}
+{
+    return issetugid();
+}
 
 #elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)
 
 int OPENSSL_issetugid(void)
-	{
-	return 0;
-	}
+{
+    return 0;
+}
 
 #else
 
-#include OPENSSL_UNISTD
-#include <sys/types.h>
+# include OPENSSL_UNISTD
+# include <sys/types.h>
 
 int OPENSSL_issetugid(void)
-	{
-	if (getuid() != geteuid()) return 1;
-	if (getgid() != getegid()) return 1;
-	return 0;
-	}
+{
+    if (getuid() != geteuid())
+        return 1;
+    if (getgid() != getegid())
+        return 1;
+    return 0;
+}
 #endif
-
-
-