summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-09-05 14:32:15 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-09-05 14:32:15 -0700
commitacd277d7fd48ccfd8ef2ca052b4e144ee95a5d94 (patch)
tree58ca7002101e9789bd018b158e65af77bed52523
parent37b62a26716d3abf2ae07dd88cf54bc04d980bd8 (diff)
Remove X_NOT_POSIX #ifdefs
POSIX.1-1990 is well below the current minimum bar
-rw-r--r--listing.c39
1 files changed, 12 insertions, 27 deletions
diff --git a/listing.c b/listing.c
index 5502633..996fdf2 100644
--- a/listing.c
+++ b/listing.c
@@ -84,15 +84,15 @@ SOFTWARE.
#define DEBUG_VAR listingDebug
#include "xkbcomp.h"
#include <stdlib.h>
-#ifndef X_NOT_POSIX
+
#ifdef _POSIX_SOURCE
-#include <limits.h>
+# include <limits.h>
#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
+# define _POSIX_SOURCE
+# include <limits.h>
+# undef _POSIX_SOURCE
#endif
+
#ifndef PATH_MAX
#ifdef WIN32
#define PATH_MAX 512
@@ -109,28 +109,13 @@ SOFTWARE.
#endif
#ifdef WIN32
-#include <windows.h>
-#define FileName(file) file.cFileName
-#undef TEXT
-#undef ALTERNATE
-#else
-#define FileName(file) file->d_name
-#ifndef X_NOT_POSIX
-#include <dirent.h>
-#else
-#ifdef SYSV
-#include <dirent.h>
+# include <windows.h>
+# define FileName(file) file.cFileName
+# undef TEXT
+# undef ALTERNATE
#else
-#ifdef USG
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#ifndef dirent
-#define dirent direct
-#endif
-#endif
-#endif
-#endif
+# include <dirent.h>
+# define FileName(file) file->d_name
#endif
#include "xkbpath.h"