xserver: Branch 'master' - 2 commits

[Alan Coopersmith]

 hw/xfree86/common/compiler.h |   30 ++++++++++++++++--------------
 hw/xfree86/common/xf86Init.c |   14 --------------
 2 files changed, 16 insertions(+), 28 deletions(-)

New commits:
commit 8dc3a7d6817b7371bbfece1108ef856788256853
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 23 14:59:46 2008 -0800

    Remove unused CLOG_DATE (leftover from pre-git ChangeLog)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index e470285..993262e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -216,20 +216,6 @@ xf86PrintBanner(void)
 #endif
   }
 #endif
-#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
-  {
-    struct tm t;
-    char buf[100];
-
-    bzero(&t, sizeof(t));
-    bzero(buf, sizeof(buf));
-    t.tm_mday = CLOG_DATE % 100;
-    t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
-    t.tm_year = CLOG_DATE / 10000 - 1900;
-    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
-       ErrorF("Changelog Date: %s\n", buf);
-  }
-#endif
 #if defined(BUILDERSTRING)
   ErrorF("%s \n",BUILDERSTRING);
 #endif
commit fe05a46f191ebd36251dda7a9703d90c25efec11
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 23 14:55:26 2008 -0800

    Remove powerpc load/store functions from export list on other platforms

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 5154511..0c6928c 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -110,20 +110,22 @@ extern _X_EXPORT unsigned int inl(unsigned long);
 #   endif /* __sparc__,  __arm32__, __alpha__ */
 #  endif /* __arm__ */
 
-extern _X_EXPORT unsigned long ldq_u(unsigned long *);
-extern _X_EXPORT unsigned long ldl_u(unsigned int *);
-extern _X_EXPORT unsigned long ldw_u(unsigned short *);
-extern _X_EXPORT void stq_u(unsigned long, unsigned long *);
-extern _X_EXPORT void stl_u(unsigned long, unsigned int *);
-extern _X_EXPORT void stw_u(unsigned long, unsigned short *);
-extern _X_EXPORT void mem_barrier(void);
-extern _X_EXPORT void write_mem_barrier(void);
-extern _X_EXPORT void stl_brx(unsigned long, volatile unsigned char *, int);
-extern _X_EXPORT void stw_brx(unsigned short, volatile unsigned char *, int);
-extern _X_EXPORT unsigned long ldl_brx(volatile unsigned char *, int);
-extern _X_EXPORT unsigned short ldw_brx(volatile unsigned char *, int);
-
-# endif
+#  if defined(__powerpc__) && !defined(__OpenBSD__)
+extern unsigned long ldq_u(unsigned long *);
+extern unsigned long ldl_u(unsigned int *);
+extern unsigned long ldw_u(unsigned short *);
+extern void stq_u(unsigned long, unsigned long *);
+extern void stl_u(unsigned long, unsigned int *);
+extern void stw_u(unsigned long, unsigned short *);
+extern void mem_barrier(void);
+extern void write_mem_barrier(void);
+extern void stl_brx(unsigned long, volatile unsigned char *, int);
+extern void stw_brx(unsigned short, volatile unsigned char *, int);
+extern unsigned long ldl_brx(volatile unsigned char *, int);
+extern unsigned short ldw_brx(volatile unsigned char *, int);
+#  endif /* __powerpc__ && !__OpenBSD */
+
+# endif /* NO_INLINE || DO_PROTOTYPES */
 
 # ifndef NO_INLINE
 #  ifdef __GNUC__