[PATCH] Fix linux build

Wald Commits scm-commit at wald.intevation.org
Fri Jun 27 11:01:18 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1403859674 -7200
# Node ID d4766b4922c9c5ac229448f203350ea3d5096aad
# Parent  1753706342269696e121a359b28e7645e9c95ee6
Fix linux build

diff -r 175370634226 -r d4766b4922c9 cinst/nssstore_win.c
--- a/cinst/nssstore_win.c	Fri Jun 27 10:27:08 2014 +0200
+++ b/cinst/nssstore_win.c	Fri Jun 27 11:01:14 2014 +0200
@@ -179,7 +179,6 @@
       return NULL;
     }
 
-
   /* Obtain the current user sid to prevent it from being returned. */
   current_user = get_process_owner (GetCurrentProcess());
 
diff -r 175370634226 -r d4766b4922c9 common/util.c
--- a/common/util.c	Fri Jun 27 10:27:08 2014 +0200
+++ b/common/util.c	Fri Jun 27 11:01:14 2014 +0200
@@ -19,6 +19,7 @@
 #include <windows.h>
 #endif
 
+#ifdef WIN32
 static PSID
 copy_sid(PSID from)
 {
@@ -67,6 +68,7 @@
       }
     return NULL;
 }
+#endif
 
 bool
 is_elevated()


More information about the Trustbridge-commits mailing list