diff options
| author | Keith Packard <keithp@keithp.com> | 2005-07-13 07:23:56 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-07-13 07:23:56 +0000 |
| commit | ec7a156bcdbe8e4bddf232d4a03f47d426096736 (patch) | |
| tree | cad2f15b8abf978be7e2f3ada34055241035e89e | |
| parent | 2a0445903d06c332acf70cfd18ba57ddbbeada32 (diff) | |
Make some minor source adjustments so that we don not need to use
-D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the
modular environment and into application build processes, potentially
foulling up their compiles.
| -rw-r--r-- | Xfuncs.h | 2 | ||||
| -rw-r--r-- | Xos.h | 14 | ||||
| -rw-r--r-- | Xos_r.h | 2 | ||||
| -rw-r--r-- | Xosdefs.h | 2 |
4 files changed, 15 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/include/Xfuncs.h,v 1.1.4.2 2003/12/20 00:28:21 kaleb Exp $ + * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $ * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/include/Xos.h,v 1.3 2004/11/15 15:06:53 ago Exp $ + * $XdotOrg: xc/include/Xos.h,v 1.4 2005/01/03 18:03:49 eich Exp $ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -57,7 +57,17 @@ in this Software without prior written authorization from The Open Group. #include <sys/types.h> #define _POSIX_SOURCE #else -#include <sys/types.h> +/* + * Make sure _XOPEN_SOURCE is defined before including sys/select.h + * so that we get fds_bits in fd_set instead of __fds_bits + */ +# ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE +# include <sys/types.h> +# undef _XOPEN_SOURCE +# else +# include <sys/types.h> +# endif #endif #endif /* USG */ @@ -1,5 +1,5 @@ /* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/include/Xos_r.h,v 1.4 2005/03/02 19:29:31 alanc Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -1,7 +1,7 @@ /* * O/S-dependent (mis)feature macro definitions * - * $XdotOrg: xc/include/Xosdefs.h,v 1.2 2004/04/23 18:43:05 eich Exp $ + * $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 |