[61670] trunk/base/src/pextlib1.0

[toby at macports.org]

Revision: 61670
          http://trac.macports.org/changeset/61670
Author:   toby at macports.org
Date:     2009-12-17 23:59:57 -0800 (Thu, 17 Dec 2009)
Log Message:
-----------
remove a bunch of useless #ifdef guards

Modified Paths:
--------------
    trunk/base/src/pextlib1.0/Pextlib.c
    trunk/base/src/pextlib1.0/fs-traverse.c
    trunk/base/src/pextlib1.0/readline.c
    trunk/base/src/pextlib1.0/tty.c
    trunk/base/src/pextlib1.0/uid.c

Modified: trunk/base/src/pextlib1.0/Pextlib.c
===================================================================
--- trunk/base/src/pextlib1.0/Pextlib.c	2009-12-18 05:54:17 UTC (rev 61669)
+++ trunk/base/src/pextlib1.0/Pextlib.c	2009-12-18 07:59:57 UTC (rev 61670)
@@ -36,48 +36,23 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <grp.h>
+#include <limits.h>
+#include <pwd.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#if HAVE_STRINGS_H
 #include <strings.h>
-#endif
-
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-#include <pwd.h>
-
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <tcl.h>
 
 #include "Pextlib.h"

Modified: trunk/base/src/pextlib1.0/fs-traverse.c
===================================================================
--- trunk/base/src/pextlib1.0/fs-traverse.c	2009-12-18 05:54:17 UTC (rev 61669)
+++ trunk/base/src/pextlib1.0/fs-traverse.c	2009-12-18 07:59:57 UTC (rev 61670)
@@ -37,24 +37,14 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-
-#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif
-
-#include <fts.h>
 #include <errno.h>
-
-#if HAVE_LIMITS_H
+#include <fts.h>
 #include <limits.h>
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <tcl.h>
 

Modified: trunk/base/src/pextlib1.0/readline.c
===================================================================
--- trunk/base/src/pextlib1.0/readline.c	2009-12-18 05:54:17 UTC (rev 61669)
+++ trunk/base/src/pextlib1.0/readline.c	2009-12-18 07:59:57 UTC (rev 61670)
@@ -13,12 +13,9 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
 #endif

Modified: trunk/base/src/pextlib1.0/tty.c
===================================================================
--- trunk/base/src/pextlib1.0/tty.c	2009-12-18 05:54:17 UTC (rev 61669)
+++ trunk/base/src/pextlib1.0/tty.c	2009-12-18 07:59:57 UTC (rev 61670)
@@ -37,12 +37,9 @@
 #include <config.h>
 #endif
 
-#if HAVE_UNISTD_H
+#include <sys/ioctl.h>
 #include <unistd.h>
-#endif
 
-#include <sys/ioctl.h>
-
 #include <tcl.h>
 
 #include "tty.h"

Modified: trunk/base/src/pextlib1.0/uid.c
===================================================================
--- trunk/base/src/pextlib1.0/uid.c	2009-12-18 05:54:17 UTC (rev 61669)
+++ trunk/base/src/pextlib1.0/uid.c	2009-12-18 07:59:57 UTC (rev 61670)
@@ -12,29 +12,14 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <grp.h>
-#include <string.h>
-
-#if HAVE_STDLIB_H
+#include <pwd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#endif
-
-#if HAVE_UNISTD_H
+#include <string.h>
 #include <unistd.h>
-#endif
 
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-
-#if HAVE_PWD_H
-#include <pwd.h>
-#endif
-
 #include <tcl.h>
 
 #include "uid.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091218/27175e60/attachment.html>