From 19a5d31fc7c022f1ca4ddb62970efa677237ad77 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Tue, 21 Apr 2015 13:31:07 +0200
Subject: [PATCH] Fixed compiler warnings

---
 src/elogd.c                           | 10 ++++++++++
 src/elogd.h                           | 10 +---------
 xcode/elogd.xcodeproj/project.pbxproj |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/elogd.c b/src/elogd.c
index d4c96775..f0b57b65 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -190,6 +190,16 @@ char _identify_cmd[256];
 int run_service(void);
 #endif
 
+#ifdef OS_UNIX
+gid_t orig_gid;                 /* Original effective GID before dropping privilege */
+uid_t orig_uid;                 /* Original effective UID before dropping privilege */
+char pidfile[256];              /* Pidfile name                                     */
+#endif
+
+#ifdef __CYGWIN__               /* bug in cygwin, 'timezone' not linked automatically */
+long _timezone;
+#endif
+
 /*---- Funcions from the MIDAS library -----------------------------*/
 
 #define my_toupper(_c)    ( ((_c)>='a' && (_c)<='z') ? ((_c)-'a'+'A') : (_c) )
diff --git a/src/elogd.h b/src/elogd.h
index ce4b06f6..17f4a92c 100644
--- a/src/elogd.h
+++ b/src/elogd.h
@@ -134,16 +134,8 @@ typedef int BOOL;
 #define stricmp(s1, s2) strcasecmp(s1, s2)
 #endif
 
-gid_t orig_gid;                 /* Original effective GID before dropping privilege */
-uid_t orig_uid;                 /* Original effective UID before dropping privilege */
-char pidfile[256];              /* Pidfile name                                     */
-
 #endif                          /* OS_UNIX */
 
-#ifdef __CYGWIN__               /* bug in cygwin, 'tmezone' not linked automatically */
-long _timezone;
-#endif
-
 /* SSL includes */
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
@@ -255,7 +247,7 @@ typedef struct {
 
 typedef struct LBNODE *LBLIST;
 
-struct LBNODE {
+typedef struct LBNODE {
    char name[256];
    LBLIST *member;
    int n_members;
diff --git a/xcode/elogd.xcodeproj/project.pbxproj b/xcode/elogd.xcodeproj/project.pbxproj
index f1609bb8..0ac4bf21 100644
--- a/xcode/elogd.xcodeproj/project.pbxproj
+++ b/xcode/elogd.xcodeproj/project.pbxproj
@@ -153,7 +153,7 @@
 		D52BA2F113999DB0000458E3 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = PSI;
 			};
 			buildConfigurationList = D52BA2F413999DB0000458E3 /* Build configuration list for PBXProject "elogd" */;
@@ -219,6 +219,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -248,6 +249,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;