os, xfree86: Stop being so weird about <limits.h>
Whatever problem this is trying to fix, we don't care. Just include the thing and stop worrying about whether _POSIX_SOURCE is defined. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
parent
d9e23ea422
commit
152375f4e4
|
@ -337,13 +337,7 @@ struct pcvtid {
|
||||||
#define MAXHOSTNAMELEN 32
|
#define MAXHOSTNAMELEN 32
|
||||||
#endif /* !MAXHOSTNAMELEN */
|
#endif /* !MAXHOSTNAMELEN */
|
||||||
|
|
||||||
#if defined(_POSIX_SOURCE)
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#else
|
|
||||||
#define _POSIX_SOURCE
|
|
||||||
#include <limits.h>
|
|
||||||
#undef _POSIX_SOURCE
|
|
||||||
#endif /* _POSIX_SOURCE */
|
|
||||||
|
|
||||||
#ifndef DEV_MEM
|
#ifndef DEV_MEM
|
||||||
#define DEV_MEM "/dev/mem"
|
#define DEV_MEM "/dev/mem"
|
||||||
|
|
|
@ -65,14 +65,7 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <X11/Xdefs.h>
|
#include <X11/Xdefs.h>
|
||||||
#include <X11/Xfuncproto.h>
|
#include <X11/Xfuncproto.h>
|
||||||
|
|
||||||
#if defined(_POSIX_SOURCE)
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#else
|
|
||||||
#define _POSIX_SOURCE
|
|
||||||
#include <limits.h>
|
|
||||||
#undef _POSIX_SOURCE
|
|
||||||
#endif /* _POSIX_SOURCE */
|
|
||||||
|
|
||||||
#if !defined(MAXHOSTNAMELEN)
|
#if !defined(MAXHOSTNAMELEN)
|
||||||
#define MAXHOSTNAMELEN 32
|
#define MAXHOSTNAMELEN 32
|
||||||
|
|
|
@ -55,14 +55,7 @@ SOFTWARE.
|
||||||
#include <X11/Xdmcp.h>
|
#include <X11/Xdmcp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _POSIX_SOURCE
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#else
|
|
||||||
#define _POSIX_SOURCE
|
|
||||||
#include <limits.h>
|
|
||||||
#undef _POSIX_SOURCE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <X11/Xos.h>
|
#include <X11/Xos.h>
|
||||||
|
|
||||||
|
|
12
os/utils.c
12
os/utils.c
|
@ -83,19 +83,7 @@ __stdcall unsigned long GetTickCount(void);
|
||||||
#include <X11/fonts/libxfont2.h>
|
#include <X11/fonts/libxfont2.h>
|
||||||
#include "osdep.h"
|
#include "osdep.h"
|
||||||
#include "extension.h"
|
#include "extension.h"
|
||||||
#ifdef X_POSIX_C_SOURCE
|
|
||||||
#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#undef _POSIX_C_SOURCE
|
|
||||||
#else
|
|
||||||
#if defined(_POSIX_SOURCE)
|
|
||||||
#include <signal.h>
|
|
||||||
#else
|
|
||||||
#define _POSIX_SOURCE
|
|
||||||
#include <signal.h>
|
|
||||||
#undef _POSIX_SOURCE
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue