[120042] branches/release_2_3/base

[cal at macports.org]

Revision: 120042
          https://trac.macports.org/changeset/120042
Author:   cal at macports.org
Date:     2014-05-14 05:47:24 -0700 (Wed, 14 May 2014)
Log Message:
-----------
Merge r119992 from trunk:

 base: pextlib1.0: Use #ifdef/#ifndef rather than #if !HAVE_SETMODE/#if HAVE_SETMODE

Revision Links:
--------------
    https://trac.macports.org/changeset/119992

Modified Paths:
--------------
    branches/release_2_3/base/src/pextlib1.0/Pextlib.c
    branches/release_2_3/base/src/pextlib1.0/setmode.c
    branches/release_2_3/base/src/pextlib1.0/xinstall.c

Property Changed:
----------------
    branches/release_2_3/base/


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/release_2_3/base/src/pextlib1.0/Pextlib.c	2014-05-14 12:46:23 UTC (rev 120041)
+++ branches/release_2_3/base/src/pextlib1.0/Pextlib.c	2014-05-14 12:47:24 UTC (rev 120042)
@@ -94,7 +94,7 @@
 extern char **environ;
 #endif
 
-#if !HAVE_SETMODE
+#ifndef HAVE_SETMODE
 #include "setmode.h"
 #endif
 

Modified: branches/release_2_3/base/src/pextlib1.0/setmode.c
===================================================================
--- branches/release_2_3/base/src/pextlib1.0/setmode.c	2014-05-14 12:46:23 UTC (rev 120041)
+++ branches/release_2_3/base/src/pextlib1.0/setmode.c	2014-05-14 12:47:24 UTC (rev 120042)
@@ -36,10 +36,8 @@
 
 #include <config.h>
 
-extern int xxx_so_this_isnt_empty;
+#ifndef HAVE_SETMODE
 
-#if !HAVE_SETMODE
-
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
@@ -479,5 +477,8 @@
 		}
 	}
 }
-#endif
+#else /* !defined(HAVE_SETMODE) */
 
+extern int xxx_so_this_isnt_empty;
+
+#endif /* !defined(HAVE_SETMODE) */

Modified: branches/release_2_3/base/src/pextlib1.0/xinstall.c
===================================================================
--- branches/release_2_3/base/src/pextlib1.0/xinstall.c	2014-05-14 12:46:23 UTC (rev 120041)
+++ branches/release_2_3/base/src/pextlib1.0/xinstall.c	2014-05-14 12:47:24 UTC (rev 120042)
@@ -104,7 +104,7 @@
 #define ALLPERMS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
 #endif
 
-#if !HAVE_SETMODE
+#ifndef HAVE_SETMODE
 #include "setmode.h"
 #endif
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140514/053f291a/attachment.html>