ChangeSet ID:	19396
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2005/08/09 05:37:50

Modified files:
	server         : thread.c sock.c request.c registry.c 
	                 named_pipe.c 

Log message:
	Mike McCormack <mike@codeweavers.com>
	Fix some gcc 4.0 warnings.

Patch: http://cvs.winehq.org/patch.py?id=19396

Old revision  New revision  Changes     Path
 1.124         1.125         +2 -2       wine/server/thread.c
 1.57          1.58          +1 -2       wine/server/sock.c
 1.92          1.93          +1 -1       wine/server/request.c
 1.80          1.81          +1 -1       wine/server/registry.c
 1.45          1.46          +1 -1       wine/server/named_pipe.c

Index: wine/server/thread.c
diff -u -p wine/server/thread.c:1.124 wine/server/thread.c:1.125
--- wine/server/thread.c:1.124	Wed May 22 18:00:40 2013
+++ wine/server/thread.c	Wed May 22 18:00:40 2013
@@ -734,8 +734,8 @@ static void get_selector_entry( struct t
     {
         unsigned char flags_buf[4];
         int *addr = (int *)thread->process->ldt_copy + entry;
-        if (read_thread_int( thread, addr, base ) == -1) goto done;
-        if (read_thread_int( thread, addr + 8192, limit ) == -1) goto done;
+        if (read_thread_int( thread, addr, (int *)base ) == -1) goto done;
+        if (read_thread_int( thread, addr + 8192, (int *)limit ) == -1) goto done;
         addr = (int *)thread->process->ldt_copy + 2*8192 + (entry >> 2);
         if (read_thread_int( thread, addr, (int *)flags_buf ) == -1) goto done;
         *flags = flags_buf[entry & 3];

Index: wine/server/sock.c
diff -u -p wine/server/sock.c:1.57 wine/server/sock.c:1.58
--- wine/server/sock.c:1.57	Wed May 22 18:00:40 2013
+++ wine/server/sock.c	Wed May 22 18:00:40 2013
@@ -623,7 +623,6 @@ static struct sock *accept_socket( obj_h
     struct sock *sock;
     int	acceptfd;
     struct sockaddr	saddr;
-    int			slen;
 
     sock=(struct sock*)get_handle_obj(current->process,handle,
                                       GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops);
@@ -642,7 +641,7 @@ static struct sock *accept_socket( obj_h
          * or that accept() is allowed on it. In those cases we will get -1/errno
          * return.
          */
-        slen = sizeof(saddr);
+        unsigned int slen = sizeof(saddr);
         acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen);
         if (acceptfd==-1)
         {

Index: wine/server/request.c
diff -u -p wine/server/request.c:1.92 wine/server/request.c:1.93
--- wine/server/request.c:1.92	Wed May 22 18:00:40 2013
+++ wine/server/request.c	Wed May 22 18:00:40 2013
@@ -488,7 +488,7 @@ static void master_socket_poll_event( st
     else if (event & POLLIN)
     {
         struct sockaddr_un dummy;
-        int len = sizeof(dummy);
+        unsigned int len = sizeof(dummy);
         int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len );
         if (client == -1) return;
         if (sock->timeout)

Index: wine/server/registry.c
diff -u -p wine/server/registry.c:1.80 wine/server/registry.c:1.81
--- wine/server/registry.c:1.80	Wed May 22 18:00:40 2013
+++ wine/server/registry.c	Wed May 22 18:00:40 2013
@@ -879,7 +879,7 @@ static void set_value( struct key *key,
 }
 
 /* get a key value */
-static void get_value( struct key *key, const WCHAR *name, int *type, int *len )
+static void get_value( struct key *key, const WCHAR *name, int *type, unsigned int *len )
 {
     struct key_value *value;
     int index;

Index: wine/server/named_pipe.c
diff -u -p wine/server/named_pipe.c:1.45 wine/server/named_pipe.c:1.46
--- wine/server/named_pipe.c:1.45	Wed May 22 18:00:40 2013
+++ wine/server/named_pipe.c	Wed May 22 18:00:40 2013
@@ -712,7 +712,7 @@ DECL_HANDLER(wait_named_pipe)
     }
     else
     {
-        unsigned int timeout;
+        int timeout;
         if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT)
             timeout = pipe->timeout;
         else