From 5bad478221c54c0dbf682ef2569f6ca5ac050049 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun, 14 Jun 2009 09:10:06 -0700
Subject: Use indentation to provide a map through the twisty maze of ifdefs,
 all alike

git diff -w shows no changes other than whitespace in this patch

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 Xfuncs.h | 100 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

(limited to 'Xfuncs.h')

diff --git a/Xfuncs.h b/Xfuncs.h
index d86f474..1dead0c 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -25,70 +25,70 @@ in this Software without prior written authorization from The Open Group.
  */
 
 #ifndef _XFUNCS_H_
-#define _XFUNCS_H_
+# define _XFUNCS_H_
 
-#include <X11/Xosdefs.h>
+# include <X11/Xosdefs.h>
 
 /* the old Xfuncs.h, for pre-R6 */
-#if !(defined(XFree86LOADER) && defined(IN_MODULE))
+# if !(defined(XFree86LOADER) && defined(IN_MODULE))
 
-#ifdef X_USEBFUNCS
+#  ifdef X_USEBFUNCS
 void bcopy();
 void bzero();
 int bcmp();
-#else
-#if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__)
-#include <memory.h>
+#  else
+#   if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__)
+#    include <memory.h>
 void bcopy();
-#define bzero(b,len) memset(b, 0, len)
-#define bcmp(b1,b2,len) memcmp(b1, b2, len)
-#else
-#include <string.h>
-#if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__)
-#include <strings.h>
-#endif
-#define _XFUNCS_H_INCLUDED_STRING_H
-#if defined(sun)
-#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#define bzero(b,len) memset(b, 0, (size_t)(len))
-#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
-#endif
-#endif
-#endif /* X_USEBFUNCS */
+#    define bzero(b,len) memset(b, 0, len)
+#    define bcmp(b1,b2,len) memcmp(b1, b2, len)
+#   else
+#    include <string.h>
+#    if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__)
+#     include <strings.h>
+#    endif
+#    define _XFUNCS_H_INCLUDED_STRING_H
+#    if defined(sun)
+#     define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
+#     define bzero(b,len) memset(b, 0, (size_t)(len))
+#     define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
+#    endif
+#   endif
+#  endif /* X_USEBFUNCS */
 
 /* the new Xfuncs.h */
 
-#if (!defined(sun) || defined(SVR4))
+#  if (!defined(sun) || defined(SVR4))
 /* the ANSI C way */
-#ifndef _XFUNCS_H_INCLUDED_STRING_H
-#include <string.h>
-#endif
-#undef bzero
-#define bzero(b,len) memset(b,0,len)
-#else
-#if defined(SYSV) || defined(sun) 
-#include <memory.h>
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#if defined(SYSV) && defined(_XBCOPYFUNC)
-#undef memmove
-#define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
-#define _XNEEDBCOPYFUNC
-#endif
-#else /* else vanilla BSD */
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len))
-#endif /* SYSV else */
-#endif 
+#   ifndef _XFUNCS_H_INCLUDED_STRING_H
+#    include <string.h>
+#   endif
+#   undef bzero
+#   define bzero(b,len) memset(b,0,len)
+#  else
+#   if defined(SYSV) || defined(sun)
+#    include <memory.h>
+#    define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
+#    if defined(SYSV) && defined(_XBCOPYFUNC)
+#     undef memmove
+#     define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
+#     define _XNEEDBCOPYFUNC
+#    endif
+#   else /* else vanilla BSD */
+#    define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
+#    define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
+#    define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len))
+#   endif /* SYSV else */
+#  endif
 
-#if (defined(sun) && !defined(SVR4))
-#define atexit(f) on_exit(f, 0)
-#endif
+#  if (defined(sun) && !defined(SVR4))
+#   define atexit(f) on_exit(f, 0)
+#  endif
 
-#if defined WIN32 && defined __MINGW32__
-#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#endif
+#  if defined WIN32 && defined __MINGW32__
+#   define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
+#  endif
 
-#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
+# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
 
 #endif /* _XFUNCS_H_ */
-- 
cgit v1.2.1