At least it compiles now. Hope it works too...

[pkgsrc-xorg-server.git] / patches / patch-ad

diff --git a/patches/patch-ad b/patches/patch-ad
index 84adf841549aa079b763eff273db20e3999128e5..961c2c4f48ca267ba2597fc0305c0bfe305781bf 100644 (file)
--- a/patches/patch-ad
+++ b/patches/patch-ad
@@ -1,13 +1,58 @@
 $NetBSD$
 
---- hw/xfree86/common/compiler.h.orig  2008-06-10 13:57:19.000000000 -0400
-+++ hw/xfree86/common/compiler.h
-@@ -564,7 +564,7 @@ inl(unsigned short port)
-    return ret;
+--- os/log.c.orig      2009-03-06 19:04:17.000000000 +0900
++++ os/log.c
+@@ -526,36 +526,6 @@ VAuditF(const char *f, va_list args)
  }
  
--#   elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
-+#   elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__)
+ _X_EXPORT void
+-FatalError(const char *f, ...)
+-{
+-    va_list args;
+-    static Bool beenhere = FALSE;
+-
+-    if (beenhere)
+-      ErrorF("\nFatalError re-entered, aborting\n");
+-    else
+-      ErrorF("\nFatal server error:\n");
+-
+-    va_start(args, f);
+-    VErrorF(f, args);
+-    va_end(args);
+-    ErrorF("\n");
+-#ifdef DDXOSFATALERROR
+-    if (!beenhere)
+-      OsVendorFatalError();
+-#endif
+-#ifdef ABORTONFATALERROR
+-    abort();
+-#endif
+-    if (!beenhere) {
+-      beenhere = TRUE;
+-      AbortServer();
+-    } else
+-      abort();
+-    /*NOTREACHED*/
+-}
+-
+-_X_EXPORT void
+ VErrorF(const char *f, va_list args)
+ {
+ #ifdef DDXOSVERRORF
+@@ -568,16 +538,6 @@ VErrorF(const char *f, va_list args)
+ #endif
+ }
+ 
+-_X_EXPORT void
+-ErrorF(const char * f, ...)
+-{
+-    va_list args;
+-
+-    va_start(args, f);
+-    VErrorF(f, args);
+-    va_end(args);
+-}
+-
+ /* A perror() workalike. */
  
- #    if !defined(Lynx)
- #     ifndef ASI_PL
+ #ifndef NEED_STRERROR