[xorg-commit-diffs] xc/programs/Xserver/os access.c, 1.1.4.3.2.2, 1.1.4.3.2.2.2.1 utils.c, 1.1.4.6.2.4, 1.1.4.6.2.4.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/os
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/os

Modified Files:
      Tag: XPRINT
	access.c utils.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: access.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/os/access.c,v
retrieving revision 1.1.4.3.2.2
retrieving revision 1.1.4.3.2.2.2.1
diff -u -d -r1.1.4.3.2.2 -r1.1.4.3.2.2.2.1
--- a/access.c	17 Mar 2004 17:39:36 -0000	1.1.4.3.2.2
+++ b/access.c	10 Apr 2004 09:05:36 -0000	1.1.4.3.2.2.2.1
@@ -2035,7 +2035,7 @@
 	    {
 		struct  sockaddr_in  sin;
 
-    		sin.sa_family = hp->h_addrtype;
+    		sin.sin_family = hp->h_addrtype;
 		acopy ( *addrlist, &(sin.sin_addr), hp->h_length);
 		hostaddrlen = sizeof(sin);
     		f = ConvertAddr ((struct sockaddr *)&sin, 
@@ -2046,7 +2046,7 @@
 		    break;
 		}
     	    }
-
+        }
     }
 #endif
     return res;

Index: utils.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
retrieving revision 1.1.4.6.2.4
retrieving revision 1.1.4.6.2.4.6.1
diff -u -d -r1.1.4.6.2.4 -r1.1.4.6.2.4.6.1
--- a/utils.c	4 Mar 2004 17:48:31 -0000	1.1.4.6.2.4
+++ b/utils.c	10 Apr 2004 09:05:36 -0000	1.1.4.6.2.4.6.1
@@ -168,7 +168,7 @@
 
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
-extern int dispatchExceptionAtReset;
+extern char dispatchExceptionAtReset;
 
 OsSigHandlerPtr
 OsSignal(sig, handler)