Module Name: xsrc Committed By: wiz Date: Thu Jul 12 12:00:08 UTC 2012
Modified Files: xsrc/external/mit/xinit/dist: xinit.c Log Message: Instead of local patch, merge upstream git version: commit 45cc81cd7abafe61bddb3ddce9f4fb8a9aa06c12 Author: Julien Cristau <jcris...@debian.org> Date: Thu Sep 8 22:11:15 2011 +0200 Include <sys/time.h> and <sys/resource.h> unconditionally Suggested by Mark Kettenis. X.Org bug#40632 <https://bugs.freedesktop.org/show_bug.cgi?id=40632> Signed-off-by: Julien Cristau <jcris...@debian.org> To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xinit/dist/xinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xinit/dist/xinit.c diff -u xsrc/external/mit/xinit/dist/xinit.c:1.3 xsrc/external/mit/xinit/dist/xinit.c:1.4 --- xsrc/external/mit/xinit/dist/xinit.c:1.3 Wed Aug 3 02:50:11 2011 +++ xsrc/external/mit/xinit/dist/xinit.c Thu Jul 12 12:00:08 2012 @@ -49,10 +49,8 @@ in this Software without prior written a #endif /* For PRIO_PROCESS and setpriority() */ -#if defined(__DragonFly__) || defined(__NetBSD__) #include <sys/time.h> #include <sys/resource.h> -#endif /* __DragonFly__ */ #include <stdlib.h>