svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released

1 files changed, 61 insertions, 121 deletions

diff --git a/X11/Xosdefs.h b/X11/Xosdefs.h
index ee33a32f8..33eaee436 100644
--- a/X11/Xosdefs.h
+++ b/X11/Xosdefs.h
@@ -1,9 +1,6 @@
 /*
  * O/S-dependent (mis)feature macro definitions
  *
- * $XdotOrg: xc/include/Xosdefs.h,v 1.3 2005/04/28 22:04:12 alanc Exp $
- * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
- *
 Copyright 1991, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,151 +23,94 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
 
 #ifndef _XOSDEFS_H_
-#define _XOSDEFS_H_
+# define _XOSDEFS_H_
 
 /*
- * X_NOT_STDC_ENV means does not have ANSI C header files.  Lack of this
- * symbol does NOT mean that the system has stdarg.h.
- *
  * X_NOT_POSIX means does not have POSIX header files.  Lack of this
  * symbol does NOT mean that the POSIX environment is the default.
  * You may still have to define _POSIX_SOURCE to get it.
  */
 
-#ifdef NOSTDHDRS
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef sony
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-#define X_NOT_POSIX
-#endif
-#endif
-
-#ifdef UTEK
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef vax
-#ifndef ultrix			/* assume vanilla BSD */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef luna
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef Mips
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-  
-#ifdef USL
-#ifdef SYSV /* (release 3.2) */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef _SCO_DS
-#ifndef __SCO__
-#define __SCO__
-#endif
-#endif
-
-#ifdef __i386__
-#ifdef SYSV
-#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
-	!defined(__UNIXWARE__) && !defined(sun)
-#if !defined(_POSIX_SOURCE)
-#define X_NOT_POSIX
-#endif
-#define X_NOT_STDC_ENV
-#endif
-#endif
-#endif
-
-#ifdef MOTOROLA
-#ifdef SYSV
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef sun
+
+# ifdef _SCO_DS
+#  ifndef __SCO__
+#   define __SCO__
+#  endif
+# endif
+
+# ifdef __i386__
+#  ifdef SYSV
+#   if !defined(__SCO__) && \
+	!defined(__UNIXWARE__) && !defined(__sun)
+#    if !defined(_POSIX_SOURCE)
+#     define X_NOT_POSIX
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef __sun
 /* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4
  * This check allows non-Imake configured programs to build correctly.
  */
-#if defined(__SVR4) && !defined(SVR4)
-#define SVR4 1
-#endif
-#ifdef SVR4
+#  if defined(__SVR4) && !defined(SVR4)
+#   define SVR4 1
+#  endif
+#  ifdef SVR4
 /* define this to whatever it needs to be */
-#define X_POSIX_C_SOURCE 199300L
-#endif
-#endif
-
-#ifdef WIN32
-#ifndef _POSIX_
-#define X_NOT_POSIX
-#endif
-#endif
+#   define X_POSIX_C_SOURCE 199300L
+#  endif
+# endif
 
-#if defined(nec_ews_svr2) || defined(SX) || defined(PC_UX)
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
+# ifdef WIN32
+#  ifndef _POSIX_
+#   define X_NOT_POSIX
+#  endif
+# endif
 
-#ifdef __UNIXOS2__
-#define USGISH
-#define NULL_NOT_ZERO
-#endif
 
-#ifdef __APPLE__
-#define NULL_NOT_ZERO
+# ifdef __APPLE__
+#  define NULL_NOT_ZERO
 
 /* Defining any of these will sanitize the namespace to JUST want is defined by
  * that particular standard.  If that happens, we don't get some expected
  * prototypes, typedefs, etc (like fd_mask).  We can define _DARWIN_C_SOURCE to
  * loosen our belts a tad.
  */
-#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
-
-#ifdef __GNU__
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 4096
-#endif
-#endif
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
-# ifndef PATH_MAX
-#  define PATH_MAX	1024
+#  if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
+#   ifndef _DARWIN_C_SOURCE
+#    define _DARWIN_C_SOURCE
+#   endif
+#  endif
+
 # endif
-# ifndef MAXPATHLEN
-#  define MAXPATHLEN	1024
+
+# ifdef __GNU__
+#  ifndef PATH_MAX
+#   define PATH_MAX 4096
+#  endif
+#  ifndef MAXPATHLEN
+#   define MAXPATHLEN 4096
+#  endif
+# endif
+
+# if defined(__SCO__) || defined(__UNIXWARE__)
+#  ifndef PATH_MAX
+#   define PATH_MAX	1024
+#  endif
+#  ifndef MAXPATHLEN
+#   define MAXPATHLEN	1024
+#  endif
 # endif
-#endif
 
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
+# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
 	|| defined(__APPLE__) || defined(__DragonFly__)
-# ifndef CSRG_BASED
-#  define CSRG_BASED
+#  ifndef CSRG_BASED
+#   define CSRG_BASED
+#  endif
 # endif
-#endif
 
 #endif /* _XOSDEFS_H_ */