xserver/hw/xorg/include modularDefs.h,1.3,1.4

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xorg/include
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/include

Modified Files:
	modularDefs.h 
Log Message:
Zero out modularDefs.h; we have autotool magic for all this now.


Index: modularDefs.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xorg/include/modularDefs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- modularDefs.h	3 May 2004 15:39:44 -0000	1.3
+++ modularDefs.h	10 Jun 2004 19:36:02 -0000	1.4
@@ -1,68 +1 @@
-/* origin: unknown, but needed by os-support/linux/int10 */
-#include <sys/shm.h>
-
-/* origin: Imakefiles */
-#define XF86CONFIGFILE "/etc/xorg.conf"
-#define __XSERVERNAME__ "Xorg"
-#define DRIVERS { "ati" }
-#define IDRIVERS { "keyboard" }
-#define __XKBDEFRULES__ "xorg"
-/* XXX FIXME Shouldn't be hardwired!*/
-#define BUILDERADDR "xorg at freedesktop.org"
-#define XVENDORNAME "X.Org"
-#define __XCONFIGFILE__ XF86CONFIGFILE
-#define XORG_RELEASE "6.7.1"
-#define __VENDORDWEBSUPPORT__ "http://wiki.x.org"
-#define XORG_VERSION_CURRENT XF86_VERSION_NUMERIC(6,7,1,0,0)
-#define DPMSExtension
-#define XINPUT
-#define RENDER
-#define RANDR
-#define XFreeXDGA
-#define XF86BIGFONT
-#ifndef XFree86Server
-#define XFree86Server
-#endif
-/* !!! */
-#ifndef DEFAULT_MODULE_PATH
-#define DEFAULT_MODULE_PATH "/usr/lib/xorg/modules"
-#endif
-#ifndef DEFAULT_LOGPREFIX
-#define DEFAULT_LOGPREFIX "/var/log/Xorg."
-#endif
 
-/* origin: programs/Xserver/include/os.h */
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-#define _printf_attribute(a,b) __attribute((format(printf,a,b)))
-#else
-#define _printf_attribute(a,b) /**/
-#endif
-
-/* origin: none, working around DIX differences */
-#define OsCleanup(x) OsCleanup()
-
-/* origin: unknown */
-extern Bool noXkbExtension;
-
-#ifdef DPMSExtension
-/* origin: programs/Xserver/include/globals.h */
-extern CARD32 defaultDPMSStandbyTime;
-extern CARD32 defaultDPMSSuspendTime;
-extern CARD32 defaultDPMSOffTime;
-extern CARD32 DPMSStandbyTime;
-extern CARD32 DPMSSuspendTime;
-extern CARD32 DPMSOffTime;
-extern CARD16 DPMSPowerLevel;
-extern Bool defaultDPMSEnabled;
-extern Bool DPMSEnabled;
-extern Bool DPMSEnabledSwitch;
-extern Bool DPMSDisabledSwitch;
-extern Bool DPMSCapableFlag;
-/* origin: programs/Xserver/include/os.h */
-extern void SetDPMSTimers(void);
-extern void FreeDPMSTimers(void);
-#endif
-
-/* origin: include/site.h */
-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))