xserver: Branch 'master' - 2 commits

[Eric Anholt]

 config/config.c |    1 +
 os/utils.c      |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
diff-tree d442998e39611be6805ea261f2286a2fd00f49b1 (from 228b9f77696190e47d4c96d6e0809bf645751557)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 8 13:35:36 2006 -0800

    Only do the _POSIX_C_SOURCE hackery on linux where it's required.
    
    On other OSes, the nasty hack was resulting in prototypes being hidden, so just
    don't do it.

diff --git a/os/utils.c b/os/utils.c
index 9824501..82ec704 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -53,12 +53,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#ifndef __linux__
+#include <time.h>
+#else
 /* The world's most shocking hack, to ensure we get clock_gettime() and
  * CLOCK_MONOTONIC. */
-#ifdef sun              /* Needed to tell Solaris headers not to restrict to */
-#define __EXTENSIONS__  /* only the functions defined in POSIX 199309.       */
-#endif
-
 #ifdef _POSIX_C_SOURCE
 #define _SAVED_POSIX_C_SOURCE _POSIX_C_SOURCE
 #undef _POSIX_C_SOURCE
@@ -69,6 +68,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef _SAVED_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE _SAVED_POSIX_C_SOURCE
 #endif
+#endif /* __linux__ */
 
 #ifdef __CYGWIN__
 #include <stdlib.h>
diff-tree 228b9f77696190e47d4c96d6e0809bf645751557 (from fdcc22ca1704d3519156c66804528c21b04fea65)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 8 13:32:22 2006 -0800

    Include sys/select.h to get FD_ISSET.

diff --git a/config/config.c b/config/config.c
index 523327d..76191ab 100644
--- a/config/config.c
+++ b/config/config.c
@@ -29,6 +29,7 @@
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <string.h>
+#include <sys/select.h>
 
 #include <X11/X.h>