[xorg-commit-diffs] xc/programs/Xserver/include Imakefile, 1.1.4.6, 1.1.4.7 cursor.h, 1.1.4.5, 1.1.4.6 globals.h, 1.1.4.3, 1.1.4.4 os.h, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/include
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/include

Modified Files:
      Tag: XORG-CURRENT
	Imakefile cursor.h globals.h os.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/Imakefile,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/Imakefile	26 Mar 2004 01:24:43 -0000	1.1.4.6
+++ b/Imakefile	15 Apr 2004 10:17:21 -0000	1.1.4.7
@@ -5,7 +5,8 @@
 
 XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $
 
-#if defined(XFree86Version) || defined(BSDOSArchitecture)
+#if defined(XorgVersion) || defined(XFree86Version) \
+	|| defined(BSDOSArchitecture)
 #if DoLoadableServer
 LinkSourceFile(xf86Module.h,$(XF86COMSRC))
 LinkSourceFile(xf86Opt.h,$(XF86COMSRC))

Index: cursor.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/cursor.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/cursor.h	5 Mar 2004 13:41:05 -0000	1.1.4.5
+++ b/cursor.h	15 Apr 2004 10:17:21 -0000	1.1.4.6
@@ -141,8 +141,8 @@
     int * /*px*/,
     int * /*py*/);
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 extern int XineramaGetCursorScreen(void);
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
 
 #endif /* CURSOR_H */

Index: globals.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/globals.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/globals.h	5 Mar 2004 13:41:06 -0000	1.1.4.3
+++ b/globals.h	15 Apr 2004 10:17:21 -0000	1.1.4.4
@@ -41,7 +41,7 @@
 extern Bool DPMSCapableFlag;
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 extern Bool noPanoramiXExtension;
 extern Bool PanoramiXMapped;
 extern Bool PanoramiXVisibilityNotifySent;

Index: os.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/os.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/os.h	5 Mar 2004 13:41:06 -0000	1.1.4.4
+++ b/os.h	15 Apr 2004 10:17:21 -0000	1.1.4.5
@@ -333,7 +333,7 @@
 
 typedef struct sockaddr * sockaddrPtr;
 
-extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/);
+extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
 
 extern int LocalClient(ClientPtr /* client */);