PATCH: Prefer sys/limits.h over machine/limits.h

Gerald Pfeifer gerald at pfeifer.com
Sun Aug 21 15:54:20 CDT 2005


The following change to dlls/kernel/time.c added code which, at least
on current versions of FreeBSD, is not what we'd like (and Darwin is,
to quite some extent, based on FreeBSD):

  revision 1.51
  date: 2005/05/18 18:20:23;  author: julliard;  state: Exp;  lines: +3 -0
  Emmanuel Maillard <e.rsz at libertysurf.fr>
  Added Darwin 8.0 specific headers.

Whenever sys/limits.h is present, we really want to prefer that over
machine/limits.h, though we'll still fill back to the latter if the
former is not present.

Gerald

ChangeLog:
Prefer sys/limits.h over machine/limits.h
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.397
diff -u -3 -p -r1.397 configure.ac
--- configure.ac	19 Aug 2005 11:22:25 -0000	1.397
+++ configure.ac	21 Aug 2005 20:50:39 -0000
@@ -241,6 +241,7 @@ AC_CHECK_HEADERS(\
 	sys/filio.h \
 	sys/ioctl.h \
 	sys/ipc.h \
+	sys/limits.h \
 	sys/link.h \
 	sys/lwp.h \
 	sys/mman.h \
Index: dlls/kernel/time.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/time.c,v
retrieving revision 1.53
diff -u -3 -p -r1.53 time.c
--- dlls/kernel/time.c	20 Jun 2005 18:37:17 -0000	1.53
+++ dlls/kernel/time.c	21 Aug 2005 20:50:40 -0000
@@ -33,7 +33,9 @@
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif
-#ifdef HAVE_MACHINE_LIMITS_H
+#ifdef HAVE_SYS_LIMITS_H
+#include <sys/limits.h>
+#elif defined(HAVE_MACHINE_LIMITS_H)
 #include <machine/limits.h>
 #endif
 



More information about the wine-patches mailing list