[PATCH] xproto: X11/Xos.h: cleanup nested #defines

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox at inbox.ru>

Signed-off-by: Sergei Trofimovich <slyfox at inbox.ru>
---
 Xos.h |  139 ++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/Xos.h b/Xos.h
index 8e95bf4..f890f74 100644
--- a/Xos.h
+++ b/Xos.h
@@ -40,16 +40,16 @@ in this Software without prior written authorization from The Open Group.
  */
 
 #ifdef USG
-#ifndef __TYPES__
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
+# ifndef __TYPES__
+#  include <sys/types.h>			/* forgot to protect it... */
+#  define __TYPES__
+# endif /* __TYPES__ */
 #else /* USG */
 # include <sys/types.h>
 #endif /* USG */
 
 #if defined(__SCO__) || defined(__UNIXWARE__)
-#include <stdint.h>
+# include <stdint.h>
 #endif
 
 
@@ -68,58 +68,57 @@ in this Software without prior written authorization from The Open Group.
 
 #include <string.h>
 #if defined(__SCO__) || defined(__UNIXWARE__)
-#include <strings.h>
+# include <strings.h>
 #else
-#if (defined(sun) && defined(__SVR4))
-#include <strings.h>
+# if (defined(sun) && defined(__SVR4))
+#  include <strings.h>
+# endif
+# ifndef index
+#  define index(s,c) (strchr((s),(c)))
+# endif
+# ifndef rindex
+#  define rindex(s,c) (strrchr((s),(c)))
+# endif
 #endif
-#ifndef index
-#define index(s,c) (strchr((s),(c)))
-#endif
-#ifndef rindex
-#define rindex(s,c) (strrchr((s),(c)))
-#endif
-#endif
-
 
 #ifdef SYSV
-#include <string.h>
-#define index strchr
-#define rindex strrchr
+# include <string.h>
+# define index strchr
+# define rindex strrchr
 #else
-#include <strings.h>
-#define strchr index
-#define strrchr rindex
+# include <strings.h>
+# define strchr index
+# define strrchr rindex
 #endif
 
 /*
  * strerror()
  */
 #if (defined(sun) && !defined(SVR4)) && !defined(__GLIBC__)
-#ifndef strerror
+# ifndef strerror
 extern char *sys_errlist[];
 extern int sys_nerr;
-#define strerror(n) \
+#  define strerror(n) \
     (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
-#endif
+# endif
 #endif
 
 /*
  * Get open(2) constants
  */
 #if defined(X_NOT_POSIX)
-#include <fcntl.h>
-#if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4)) 
-#include <unistd.h>
-#endif
-#ifdef WIN32
-#include <X11/Xw32defs.h>
-#else
-#include <sys/file.h>
-#endif
+# include <fcntl.h>
+# if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4))
+#  include <unistd.h>
+# endif
+# ifdef WIN32
+#  include <X11/Xw32defs.h>
+# else
+#  include <sys/file.h>
+# endif
 #else /* X_NOT_POSIX */
-#include <fcntl.h>
-#include <unistd.h>
+# include <fcntl.h>
+# include <unistd.h>
 #endif /* X_NOT_POSIX else */
 
 /*
@@ -128,76 +127,76 @@ extern int sys_nerr;
 
 #if defined(SYSV) 
 
-#ifndef USL
-#include <sys/time.h>
-#endif
-#include <time.h>
-#if defined(USG) 
+# ifndef USL
+#  include <sys/time.h>
+# endif
+#  include <time.h>
+#  if defined(USG)
 struct timeval {
     long tv_sec;
     long tv_usec;
 };
-#ifndef USL_SHARELIB
+#   ifndef USL_SHARELIB
 struct timezone {
     int tz_minuteswest;
     int tz_dsttime;
 };
-#endif /* USL_SHARELIB */
-#endif /* USG */
+#  endif /* USL_SHARELIB */
+# endif /* USG */
 
 
 #else /* not SYSV */
 
-#if defined(_POSIX_SOURCE) && defined(SVR4)
+# if defined(_POSIX_SOURCE) && defined(SVR4)
 /* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */
-#undef _POSIX_SOURCE
-#include <sys/time.h>
-#define _POSIX_SOURCE
-#elif defined(WIN32)
-#include <time.h>
-#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
+#  undef _POSIX_SOURCE
+#  include <sys/time.h>
+#  define _POSIX_SOURCE
+# elif defined(WIN32)
+# include <time.h>
+# if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
 struct timeval {
     long    tv_sec;         /* seconds */
     long    tv_usec;        /* and microseconds */
 };
-#define _TIMEVAL_DEFINED
-#endif
-#include <sys/timeb.h>
-#define gettimeofday(t) \
+#   define _TIMEVAL_DEFINED
+#  endif
+#  include <sys/timeb.h>
+#  define gettimeofday(t) \
 { \
     struct _timeb _gtodtmp; \
     _ftime (&_gtodtmp); \
     (t)->tv_sec = _gtodtmp.time; \
     (t)->tv_usec = _gtodtmp.millitm * 1000; \
 }
-#else
-#include <sys/time.h>
-#include <time.h>
-#endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
+# else
+#  include <sys/time.h>
+#  include <time.h>
+# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
 
 #endif /* SYSV */
 
 /* define X_GETTIMEOFDAY macro, a portable gettimeofday() */
 #if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#else
-#if defined(SVR4) || defined(WIN32)
-#define X_GETTIMEOFDAY(t) gettimeofday(t)
+# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
 #else
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#endif
+# if defined(SVR4) || defined(WIN32)
+#  define X_GETTIMEOFDAY(t) gettimeofday(t)
+# else
+#  define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
+# endif
 #endif /* XPG4 else */
 
 
 #ifdef __GNU__
-#define PATH_MAX 4096
-#define MAXPATHLEN 4096
-#define OPEN_MAX 256 /* We define a reasonable limit.  */
-#endif
+# define PATH_MAX 4096
+# define MAXPATHLEN 4096
+# define OPEN_MAX 256 /* We define a reasonable limit.  */
+#endif /* __GNU__ */
 
 /* use POSIX name for signal */
 #if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) 
-#define SIGCHLD SIGCLD
+# define SIGCHLD SIGCLD
 #endif
 
 #include <X11/Xarch.h>
-- 
1.6.0.6