CVS: winex/include/wine server.h, 1.14, 1.15 server_protocol.h, 1.50, 1.51

Subject: winex/include/wine server.h,1.14,1.15 server_protocol.h,1.50,1.51Update of /var/lib/cvsd/cvsroot/winex/include/wine
In directory agravaine:/tmp/cvs-serv3286/include/wine

Modified Files:
	server.h server_protocol.h 
Log Message:
Refactor SHM server to handle both POSIX and SYSV IPC.
Add support for SHM server on Mac OS X.


Index: server.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wine/server.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- server.h	31 Jul 2007 17:59:16 -0000	1.14
+++ server.h	31 Jul 2007 20:05:51 -0000	1.15
@@ -114,7 +114,8 @@
 extern BOOL call_supported_through_shared_memory( int req );
 extern BOOL server_scheduler_active( void );
 void set_shared_memory_reserved(size_t size, void *addr);
-extern void setup_shared_memory_wineserver( size_t size, void *shm_addr );
+extern void setup_shared_memory_wineserver (int shm_type, size_t shm_size,
+                                            void *shm_addr);
 
 /* non-exported functions */
 extern void server_protocol_error( const char *err, ... ) WINE_NORETURN;

Index: server_protocol.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wine/server_protocol.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- server_protocol.h	31 Jul 2007 19:57:55 -0000	1.50
+++ server_protocol.h	31 Jul 2007 20:05:51 -0000	1.51
@@ -278,6 +278,7 @@
     int          shm_server;
     size_t       shm_size;
     void*        shm_addr;
+    int          shm_type;
 };
 
 
@@ -3521,6 +3522,6 @@
     struct retrieve_assigned_io_completion_reply retrieve_assigned_io_completion_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 106
+#define SERVER_PROTOCOL_VERSION 107
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */