OSX 32/64 bits version.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1770 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -17,13 +17,17 @@ Tim Blechmann
   Jackdmp changes log
 ---------------------------
 
+2008-01-25 Stephane Letz  <letz@grame.fr>
+
+	* OSX 32/64 bits version.
+
 2008-01-24 Stephane Letz  <letz@grame.fr>
 
-	*  CoreAudio driver improvement: detect and notify abnormal situations (stopped driver in case of SR change...).
+	* CoreAudio driver improvement: detect and notify abnormal situations (stopped driver in case of SR change...).
 
 2008-01-03 Stephane Letz  <letz@grame.fr>
 
-	*  Dmitry Baikov MIDI patch : alsa_seqmidi and alsa_rammidi drivers.
+	* Dmitry Baikov MIDI patch : alsa_seqmidi and alsa_rammidi drivers.
 
 2008-01-03 Stephane Letz  <letz@grame.fr>
 

common/JackActivationCount.h

@@ -37,8 +37,8 @@ class JackActivationCount
 
     private:
 
-        long fValue;
-        long fCount;
+		SInt32 fValue;
+        SInt32 fCount;
 
     public:
 

common/JackAtomic.h

@@ -21,20 +21,24 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackAtomic__
 
 typedef unsigned short UInt16;
-typedef unsigned long UInt32;
-typedef long SInt32;
-#ifdef WIN32
-	#include <windows.h>
+#if __LP64__
+typedef unsigned int       UInt32;
+typedef signed int         SInt32;
+#else
+typedef unsigned long      UInt32;
+typedef signed long        SInt32;
+#endif
 
+#ifdef WIN32
+#include <windows.h>
 typedef ULONGLONG UInt64;
 #else
-
 typedef unsigned long long UInt64;
 #endif
 
 #if defined(__APPLE__)
 
-#if defined(__ppc__)
+#if defined(__ppc__) || defined(__ppc64__)
 
 static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
 {

common/JackChannel.h

@@ -86,7 +86,7 @@ class JackClientChannelInterface
         virtual void ClientDeactivate(int refnum, int* result)
         {}
 
-        virtual void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+        virtual void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
         {}
         virtual void PortUnRegister(int refnum, jack_port_id_t port_index, int* result)
         {}

common/JackClient.cpp

@@ -412,7 +412,7 @@ int JackClient::PortRegister(const char* port_name, const char* port_type, unsig
     JackLog("JackClient::PortRegister ref = %ld  name = %s type = %s\n", GetClientControl()->fRefNum, name.c_str(), port_type);
 
     int result = -1;
-    jack_port_id_t port_index = NO_PORT;
+    unsigned int port_index = NO_PORT;
     fChannel->PortRegister(GetClientControl()->fRefNum, name.c_str(), port_type, flags, buffer_size, &port_index, &result);
     JackLog("JackClient::PortRegister port_index = %ld \n", port_index);
 

common/JackConstants.h

@@ -70,7 +70,11 @@ namespace Jack
 
 #define ALL_CLIENTS -1 // for notification
 
-#define JACK_PROTOCOL_VERSION 2
+#if defined(__ppc64__) || defined(__x86_64__)
+	#define JACK_PROTOCOL_VERSION 3
+#else
+	#define JACK_PROTOCOL_VERSION 2
+#endif
 
 #define DRIVER_OPEN_TIMEOUT 5   // in sec
 

common/JackEngine.cpp

@@ -369,6 +369,8 @@ int JackEngine::ClientCheck(const char* name, char* name_res, int protocol, int
 	*status = 0;
 	strcpy(name_res, name);
 	
+	JackLog("Check protocol client  %ld server = %ld\n", protocol, JACK_PROTOCOL_VERSION);
+	
 	if (protocol != JACK_PROTOCOL_VERSION) {
 		*status |= (JackFailure | JackVersionError);
 		jack_error("JACK protocol mismatch (%d vs %d)", protocol, JACK_PROTOCOL_VERSION);
@@ -616,7 +618,7 @@ int JackEngine::ClientDeactivate(int refnum)
 // Port management
 //-----------------
 
-int JackEngine::PortRegister(int refnum, const char* name, const char *type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index)
+int JackEngine::PortRegister(int refnum, const char* name, const char *type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index)
 {
     JackLog("JackEngine::PortRegister ref = %ld name = %s type = %s flags = %d buffer_size = %d\n", refnum, name, type, flags, buffer_size);
     assert(fClientTable[refnum]);

common/JackEngine.h

@@ -90,7 +90,7 @@ class JackEngine
 		int InternalClientUnload(int refnum, int* status);
 
         // Port management
-        int PortRegister(int refnum, const char* name, const char *type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index);
+        int PortRegister(int refnum, const char* name, const char *type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index);
         int PortUnRegister(int refnum, jack_port_id_t port);
 
         int PortConnect(int refnum, const char* src, const char* dst);

common/JackEngineControl.h

@@ -42,7 +42,7 @@ class JackGraphManager;
 
 struct JackTimingMeasureClient
 {
-    int fRefNum;
+	int fRefNum;
     jack_time_t	fSignaledAt;
     jack_time_t	fAwakeAt;
     jack_time_t	fFinishedAt;
@@ -55,7 +55,7 @@ struct JackTimingMeasureClient
 
 struct JackTimingMeasure
 {
-    long fAudioCycle;
+	unsigned int fAudioCycle;
     jack_time_t fEngineTime;
     JackTimingMeasureClient fClientTable[CLIENT_NUM];
 };
@@ -75,7 +75,7 @@ struct JackEngineControl : public JackShmMem
     jack_time_t fTimeOutUsecs;
 	bool fTimeOut;
 	bool fRealTime;
-	int32_t fPriority;
+	int fPriority;
 	char fServerName[64];
     JackTransportEngine fTransport;
     bool fVerbose;
@@ -88,7 +88,7 @@ struct JackEngineControl : public JackShmMem
 	jack_time_t fLastProcessTime;
 	jack_time_t fSpareUsecs;
 	jack_time_t fMaxUsecs;
-	uint32_t fAudioCycle;
+	unsigned int fAudioCycle;
 	jack_time_t fRollingClientUsecs[JACK_ENGINE_ROLLING_COUNT];
 	int	fRollingClientUsecsCnt;
 	int	fRollingClientUsecsIndex;

common/JackInternalClientChannel.h

@@ -72,7 +72,7 @@ class JackInternalClientChannel : public JackClientChannelInterface
      		*result = fEngine->ClientDeactivate(refnum);
         }
 
-        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
         {
             *result = fEngine->PortRegister(refnum, name, type, flags, buffer_size, port_index);
         }

common/JackLibAPI.cpp

@@ -49,7 +49,7 @@ extern "C"
 #endif
 
 JackLibGlobals* JackLibGlobals::fGlobals = NULL;
-long JackLibGlobals::fClientCount = 0;
+int JackLibGlobals::fClientCount = 0;
 
 EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {

common/JackLibClient.cpp

@@ -94,7 +94,7 @@ int JackLibClient::Open(const char* server_name, const char* name, jack_options_
         JackLibGlobals::fGlobals->fGraphManager.SetShmIndex(shared_graph, fServerName);
         fClientControl.SetShmIndex(shared_client, fServerName);
         jack_verbose = GetEngineControl()->fVerbose;
-    } catch (int n) {
+	} catch (int n) {
         jack_error("Map shared memory segments exception %d", n);
         goto error;
     }

common/JackLibGlobals.h

@@ -49,7 +49,7 @@ struct JackLibGlobals
     std::map<mach_port_t, JackClient*> fClientTable;        /*! Client table */
 #endif
 
-    static long fClientCount;
+ 	static int fClientCount;
     static JackLibGlobals* fGlobals;
 
     JackLibGlobals()

common/JackRequest.h

@@ -385,7 +385,7 @@ struct JackPortRegisterRequest : public JackRequest
 struct JackPortRegisterResult : public JackResult
 {
 
-    jack_port_id_t fPortIndex;
+    unsigned int fPortIndex;
 
     JackPortRegisterResult():JackResult(),fPortIndex(NO_PORT)
     {}

common/JackServerGlobals.cpp

@@ -36,7 +36,8 @@ static char* server_name = NULL;
 namespace Jack
 {
 
-long JackServerGlobals::fClientCount = 0;
+//long JackServerGlobals::fClientCount = 0;
+unsigned int JackServerGlobals::fClientCount = 0;
 JackServer* JackServerGlobals::fServer = NULL;
 
 int JackServerGlobals::Start(const char* server_name, 

common/JackServerGlobals.h

@@ -37,7 +37,7 @@ class JackClient;
 
 struct JackServerGlobals
 {
-    static long fClientCount;
+ 	static unsigned int fClientCount;
     static JackServer* fServer;
 
     JackServerGlobals();

common/JackShmMem.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 namespace Jack
 {
 
-unsigned long JackShmMem::fSegmentNum = 0;
+unsigned int JackShmMem::fSegmentNum = 0;
 jack_shm_info_t JackShmMem::gInfo;
 size_t JackMem::gSize = 0;
 

common/JackShmMem.h

@@ -99,7 +99,7 @@ class JackShmMem
     protected:
 
         jack_shm_info_t fInfo;
-        static unsigned long fSegmentNum;
+		static unsigned int fSegmentNum;
         static jack_shm_info_t gInfo;
 
     public:
@@ -153,16 +153,16 @@ class JackShmReadWritePtr
 
         void Init(int index, const char* server_name = "default")
         {
-            if (fInfo.index < 0 && index >= 0) {
+			if (fInfo.index < 0 && index >= 0) {
                 JackLog("JackShmReadWritePtr::Init %ld %ld\n", index, fInfo.index);
                 if (jack_initialize_shm(server_name) < 0)
-                    throw - 1;
+                    throw -1;
                 fInfo.index = index;
                 if (jack_attach_shm(&fInfo)) {
                     //jack_error("cannot attach shared memory segment", strerror(errno));
-                    throw - 2;
+                    throw -2;
                 }
-            }
+			}
         }
 
     public:
@@ -189,12 +189,12 @@ class JackShmReadWritePtr
 
         T* operator->() const
         {
-            return (T*)fInfo.attached_at;
+	        return (T*)fInfo.attached_at;
         }
 
         operator T*() const
         {
-            return (T*)fInfo.attached_at;
+			return (T*)fInfo.attached_at;
         }
 
         JackShmReadWritePtr& operator=(int index)
@@ -215,7 +215,7 @@ class JackShmReadWritePtr
 
         T* GetShmAddress()
         {
-            return (T*)fInfo.attached_at;
+	         return (T*)fInfo.attached_at;
         }
 };
 
@@ -236,13 +236,13 @@ class JackShmReadWritePtr1
             if (fInfo.index < 0 && index >= 0) {
                 JackLog("JackShmReadWritePtr1::Init %ld %ld\n", index, fInfo.index);
                 if (jack_initialize_shm(server_name) < 0)
-                    throw - 1;
+                    throw -1;
                 fInfo.index = index;
                 if (jack_attach_shm(&fInfo)) {
                     //jack_error("cannot attach shared memory segment", strerror(errno));
-                    throw - 2;
+                    throw -2;
                 }
-                /*
+				/*
                 nobody else needs to access this shared memory any more, so
                 destroy it. because we have our own attachment to it, it won't
                 vanish till we exit (and release it).
@@ -275,7 +275,7 @@ class JackShmReadWritePtr1
 
         T* operator->() const
         {
-            return (T*)fInfo.attached_at;
+			return (T*)fInfo.attached_at;
         }
 
         operator T*() const
@@ -301,7 +301,7 @@ class JackShmReadWritePtr1
 
         T* GetShmAddress()
         {
-            return (T*)fInfo.attached_at;
+			return (T*)fInfo.attached_at;
         }
 };
 
@@ -374,14 +374,14 @@ class JackShmReadPtr
             Init(index, server_name);
         }
 
-        int GetShmIndex()
+        int GetShmIndex() 
         {
             return fInfo.index;
         }
 
         T* GetShmAddress()
         {
-            return (T*)fInfo.attached_at;
+			return (T*)fInfo.attached_at;
         }
 
 };

common/JackSocketClientChannel.cpp

@@ -179,7 +179,7 @@ void JackSocketClientChannel::ClientDeactivate(int refnum, int* result)
     ServerSyncCall(&req, &res, result);
 }
 
-void JackSocketClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+void JackSocketClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
 {
     JackPortRegisterRequest req(refnum, name, type, flags, buffer_size);
     JackPortRegisterResult res;

common/JackSocketClientChannel.h

@@ -66,7 +66,7 @@ class JackSocketClientChannel : public JackClientChannelInterface, public JackRu
         void ClientActivate(int refnum, int* result);
         void ClientDeactivate(int refnum, int* result);
 
-        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result);
+        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result);
         void PortUnRegister(int refnum, jack_port_id_t port_index, int* result);
 
         void PortConnect(int refnum, const char* src, const char* dst, int* result);

common/jack/types.h

@@ -91,7 +91,7 @@ typedef struct _jack_client jack_client_t;
  *  Ports have unique ids. A port registration callback is the only
  *  place you ever need to know their value.
  */
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__ppc64__)
 typedef uint64_t jack_port_id_t;
 #else
 typedef uint32_t jack_port_id_t;

macosx/JackMacEngineRPC.cpp

@@ -81,7 +81,7 @@ rpc_type server_rpc_jack_client_deactivate(mach_port_t private_port, int refnum,
 // Port management
 //-----------------
 
-rpc_type server_rpc_jack_port_register(mach_port_t private_port, int refnum, client_port_name_t name, client_port_type_t type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+rpc_type server_rpc_jack_port_register(mach_port_t private_port, int refnum, client_port_name_t name, client_port_type_t type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
 {
     JackLog("rpc_jack_port_register %ld %s\n", refnum, name);
     JackMachServerChannel* channel = JackMachServerChannel::fPortTable[private_port];

macosx/JackMachClientChannel.cpp

@@ -169,9 +169,9 @@ void JackMachClientChannel::ClientDeactivate(int refnum, int* result)
     }
 }
 
-void JackMachClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+void JackMachClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
 {
-    kern_return_t res = rpc_jack_port_register(fPrivatePort, refnum, (char*)name, (char*)type, flags, buffer_size, port_index, result);
+	kern_return_t res = rpc_jack_port_register(fPrivatePort, refnum, (char*)name, (char*)type, flags, buffer_size, port_index, result);
     if (res != KERN_SUCCESS) {
         *result = -1;
         jack_error("JackMachClientChannel::PortRegister err = %s", mach_error_string(res));

macosx/JackMachClientChannel.h

@@ -63,7 +63,7 @@ class JackMachClientChannel : public JackClientChannelInterface, public JackRunn
         void ClientActivate(int refnum, int* result);
         void ClientDeactivate(int refnum, int* result);
 
-        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result);
+        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result);
         void PortUnRegister(int refnum, jack_port_id_t port_index, int* result);
 
         void PortConnect(int refnum, const char* src, const char* dst, int* result);

macosx/RPC/JackRPCClientServer.c

@@ -1,7 +1,7 @@
 /*
  * IDENTIFICATION:
- * stub generated Thu Oct 25 10:49:38 2007
- * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com
+ * stub generated Thu Jan  3 14:42:41 2008
+ * with a MiG generated Sun Sep 23 15:44:06 PDT 2007 by root@hoosier.apple.com
  * OPTIONS: 
  */
 
@@ -186,7 +186,7 @@ mig_internal novalue _Xrpc_jack_client_async_notify
 	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
 
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCClient_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_sync_notify_t__defined)
 #define __MIG_check__Request__rpc_jack_client_sync_notify_t__defined
@@ -431,7 +431,7 @@ mig_internal novalue _Xrpc_jack_client_async_notify
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__value__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_sync_notify_t(__Request__rpc_jack_client_sync_notify_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_sync_notify_t(__attribute__((__unused__)) __Request__rpc_jack_client_sync_notify_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_sync_notify_t __Request;
@@ -582,7 +582,7 @@ mig_internal novalue _Xrpc_jack_client_sync_notify
 	__AfterRcvRpc(1000, "rpc_jack_client_sync_notify")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCClient_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_async_notify_t__defined)
 #define __MIG_check__Request__rpc_jack_client_async_notify_t__defined
@@ -827,7 +827,7 @@ mig_internal novalue _Xrpc_jack_client_sync_notify
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__value__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_async_notify_t(__Request__rpc_jack_client_async_notify_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_async_notify_t(__attribute__((__unused__)) __Request__rpc_jack_client_async_notify_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_async_notify_t __Request;

macosx/RPC/JackRPCClientUser.c

@@ -1,7 +1,7 @@
 /*
  * IDENTIFICATION:
- * stub generated Thu Oct 25 10:49:38 2007
- * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com
+ * stub generated Thu Jan  3 14:42:41 2008
+ * with a MiG generated Sun Sep 23 15:44:06 PDT 2007 by root@hoosier.apple.com
  * OPTIONS: 
  */
 #define	__MIG_check__Reply__JackRPCClient_subsystem__ 1
@@ -269,7 +269,6 @@ mig_external kern_return_t rpc_jack_client_sync_notify
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -356,6 +355,10 @@ mig_external kern_return_t rpc_jack_client_sync_notify
 	__BeforeSendRpc(1000, "rpc_jack_client_sync_notify")
 	msg_result = mach_msg(&InP->Head, MACH_SEND_MSG|MACH_RCV_MSG|MACH_SEND_TIMEOUT|MACH_RCV_TIMEOUT|MACH_MSG_OPTION_NONE, (mach_msg_size_t)sizeof(Request), (mach_msg_size_t)sizeof(Reply), InP->Head.msgh_reply_port, 5000, MACH_PORT_NULL);
 	__AfterSendRpc(1000, "rpc_jack_client_sync_notify")
+
+	if (msg_result == MACH_SEND_TIMED_OUT) {
+	}
+
 	if (msg_result != MACH_MSG_SUCCESS) {
 		__MachMsgErrorWithTimeout(msg_result);
 		{ return msg_result; }
@@ -371,7 +374,6 @@ mig_external kern_return_t rpc_jack_client_sync_notify
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 /* SimpleRoutine rpc_jack_client_async_notify */
@@ -384,7 +386,6 @@ mig_external kern_return_t rpc_jack_client_async_notify
 	int value
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -442,7 +443,9 @@ mig_external kern_return_t rpc_jack_client_async_notify
 	__BeforeSendSimple(1001, "rpc_jack_client_async_notify")
 	msg_result = mach_msg(&InP->Head, MACH_SEND_MSG|MACH_SEND_TIMEOUT|MACH_MSG_OPTION_NONE, (mach_msg_size_t)sizeof(Request), 0, MACH_PORT_NULL, 5000, MACH_PORT_NULL);
 	__AfterSendSimple(1001, "rpc_jack_client_async_notify")
-		return msg_result;
-	return KERN_SUCCESS;
-    }
+
+	if (msg_result == MACH_SEND_TIMED_OUT) {
+	}
+
+	return msg_result;
 }

macosx/RPC/JackRPCEngineServer.c

@@ -1,7 +1,7 @@
 /*
  * IDENTIFICATION:
- * stub generated Thu Oct 25 10:49:38 2007
- * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com
+ * stub generated Thu Jan  3 14:42:41 2008
+ * with a MiG generated Sun Sep 23 15:44:06 PDT 2007 by root@hoosier.apple.com
  * OPTIONS: 
  */
 
@@ -742,7 +742,7 @@ mig_internal novalue _Xrpc_jack_client_rt_notify
 	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
 
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_open_t__defined)
 #define __MIG_check__Request__rpc_jack_client_open_t__defined
@@ -807,7 +807,7 @@ mig_internal novalue _Xrpc_jack_client_rt_notify
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_open_t(__Request__rpc_jack_client_open_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_open_t(__attribute__((__unused__)) __Request__rpc_jack_client_open_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_open_t __Request;
@@ -941,7 +941,7 @@ mig_internal novalue _Xrpc_jack_client_open
 	__AfterRcvRpc(1000, "rpc_jack_client_open")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_check_t__defined)
 #define __MIG_check__Request__rpc_jack_client_check_t__defined
@@ -1126,7 +1126,7 @@ mig_internal novalue _Xrpc_jack_client_open
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_check_t__options__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_check_t(__Request__rpc_jack_client_check_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_check_t(__attribute__((__unused__)) __Request__rpc_jack_client_check_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_check_t __Request;
@@ -1265,7 +1265,7 @@ mig_internal novalue _Xrpc_jack_client_check
 	__AfterRcvRpc(1001, "rpc_jack_client_check")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_close_t__defined)
 #define __MIG_check__Request__rpc_jack_client_close_t__defined
@@ -1330,7 +1330,7 @@ mig_internal novalue _Xrpc_jack_client_check
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_close_t__refnum__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_close_t(__Request__rpc_jack_client_close_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_close_t(__attribute__((__unused__)) __Request__rpc_jack_client_close_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_close_t __Request;
@@ -1439,7 +1439,7 @@ mig_internal novalue _Xrpc_jack_client_close
 	__AfterRcvRpc(1002, "rpc_jack_client_close")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_activate_t__defined)
 #define __MIG_check__Request__rpc_jack_client_activate_t__defined
@@ -1504,7 +1504,7 @@ mig_internal novalue _Xrpc_jack_client_close
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_activate_t__refnum__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_activate_t(__Request__rpc_jack_client_activate_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_activate_t(__attribute__((__unused__)) __Request__rpc_jack_client_activate_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_activate_t __Request;
@@ -1613,7 +1613,7 @@ mig_internal novalue _Xrpc_jack_client_activate
 	__AfterRcvRpc(1003, "rpc_jack_client_activate")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_deactivate_t__defined)
 #define __MIG_check__Request__rpc_jack_client_deactivate_t__defined
@@ -1678,7 +1678,7 @@ mig_internal novalue _Xrpc_jack_client_activate
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_deactivate_t__refnum__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_deactivate_t(__Request__rpc_jack_client_deactivate_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_deactivate_t(__attribute__((__unused__)) __Request__rpc_jack_client_deactivate_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_deactivate_t __Request;
@@ -1787,7 +1787,7 @@ mig_internal novalue _Xrpc_jack_client_deactivate
 	__AfterRcvRpc(1004, "rpc_jack_client_deactivate")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_register_t__defined)
 #define __MIG_check__Request__rpc_jack_port_register_t__defined
@@ -2092,7 +2092,7 @@ mig_internal novalue _Xrpc_jack_client_deactivate
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_register_t__buffer_size__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_register_t(__Request__rpc_jack_port_register_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_register_t(__attribute__((__unused__)) __Request__rpc_jack_port_register_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_register_t __Request;
@@ -2258,7 +2258,7 @@ mig_internal novalue _Xrpc_jack_port_register
 	__AfterRcvRpc(1005, "rpc_jack_port_register")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_unregister_t__defined)
 #define __MIG_check__Request__rpc_jack_port_unregister_t__defined
@@ -2383,7 +2383,7 @@ mig_internal novalue _Xrpc_jack_port_register
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_unregister_t__port__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_unregister_t(__Request__rpc_jack_port_unregister_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_unregister_t(__attribute__((__unused__)) __Request__rpc_jack_port_unregister_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_unregister_t __Request;
@@ -2506,7 +2506,7 @@ mig_internal novalue _Xrpc_jack_port_unregister
 	__AfterRcvRpc(1006, "rpc_jack_port_unregister")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_connect_t__defined)
 #define __MIG_check__Request__rpc_jack_port_connect_t__defined
@@ -2691,7 +2691,7 @@ mig_internal novalue _Xrpc_jack_port_unregister
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_connect_t__dst__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_connect_t(__Request__rpc_jack_port_connect_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_connect_t(__attribute__((__unused__)) __Request__rpc_jack_port_connect_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_connect_t __Request;
@@ -2828,7 +2828,7 @@ mig_internal novalue _Xrpc_jack_port_connect
 	__AfterRcvRpc(1007, "rpc_jack_port_connect")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_disconnect_t__defined)
 #define __MIG_check__Request__rpc_jack_port_disconnect_t__defined
@@ -3013,7 +3013,7 @@ mig_internal novalue _Xrpc_jack_port_connect
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_disconnect_t__dst__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_disconnect_t(__Request__rpc_jack_port_disconnect_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_disconnect_t(__attribute__((__unused__)) __Request__rpc_jack_port_disconnect_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_disconnect_t __Request;
@@ -3150,7 +3150,7 @@ mig_internal novalue _Xrpc_jack_port_disconnect
 	__AfterRcvRpc(1008, "rpc_jack_port_disconnect")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_connect_name_t__defined)
 #define __MIG_check__Request__rpc_jack_port_connect_name_t__defined
@@ -3335,7 +3335,7 @@ mig_internal novalue _Xrpc_jack_port_disconnect
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_connect_name_t__dst__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_connect_name_t(__Request__rpc_jack_port_connect_name_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_connect_name_t(__attribute__((__unused__)) __Request__rpc_jack_port_connect_name_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_connect_name_t __Request;
@@ -3472,7 +3472,7 @@ mig_internal novalue _Xrpc_jack_port_connect_name
 	__AfterRcvRpc(1009, "rpc_jack_port_connect_name")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_port_disconnect_name_t__defined)
 #define __MIG_check__Request__rpc_jack_port_disconnect_name_t__defined
@@ -3657,7 +3657,7 @@ mig_internal novalue _Xrpc_jack_port_connect_name
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_port_disconnect_name_t__dst__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_disconnect_name_t(__Request__rpc_jack_port_disconnect_name_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_port_disconnect_name_t(__attribute__((__unused__)) __Request__rpc_jack_port_disconnect_name_t *In0P)
 {
 
 	typedef __Request__rpc_jack_port_disconnect_name_t __Request;
@@ -3794,7 +3794,7 @@ mig_internal novalue _Xrpc_jack_port_disconnect_name
 	__AfterRcvRpc(1010, "rpc_jack_port_disconnect_name")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_set_buffer_size_t__defined)
 #define __MIG_check__Request__rpc_jack_set_buffer_size_t__defined
@@ -3859,7 +3859,7 @@ mig_internal novalue _Xrpc_jack_port_disconnect_name
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_set_buffer_size_t__buffer_size__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_buffer_size_t(__Request__rpc_jack_set_buffer_size_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_buffer_size_t(__attribute__((__unused__)) __Request__rpc_jack_set_buffer_size_t *In0P)
 {
 
 	typedef __Request__rpc_jack_set_buffer_size_t __Request;
@@ -3968,7 +3968,7 @@ mig_internal novalue _Xrpc_jack_set_buffer_size
 	__AfterRcvRpc(1011, "rpc_jack_set_buffer_size")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_set_freewheel_t__defined)
 #define __MIG_check__Request__rpc_jack_set_freewheel_t__defined
@@ -4033,7 +4033,7 @@ mig_internal novalue _Xrpc_jack_set_buffer_size
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_set_freewheel_t__onoff__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_freewheel_t(__Request__rpc_jack_set_freewheel_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_freewheel_t(__attribute__((__unused__)) __Request__rpc_jack_set_freewheel_t *In0P)
 {
 
 	typedef __Request__rpc_jack_set_freewheel_t __Request;
@@ -4142,7 +4142,7 @@ mig_internal novalue _Xrpc_jack_set_freewheel
 	__AfterRcvRpc(1012, "rpc_jack_set_freewheel")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_release_timebase_t__defined)
 #define __MIG_check__Request__rpc_jack_release_timebase_t__defined
@@ -4207,7 +4207,7 @@ mig_internal novalue _Xrpc_jack_set_freewheel
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_release_timebase_t__refnum__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_release_timebase_t(__Request__rpc_jack_release_timebase_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_release_timebase_t(__attribute__((__unused__)) __Request__rpc_jack_release_timebase_t *In0P)
 {
 
 	typedef __Request__rpc_jack_release_timebase_t __Request;
@@ -4316,7 +4316,7 @@ mig_internal novalue _Xrpc_jack_release_timebase
 	__AfterRcvRpc(1013, "rpc_jack_release_timebase")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_set_timebase_callback_t__defined)
 #define __MIG_check__Request__rpc_jack_set_timebase_callback_t__defined
@@ -4441,7 +4441,7 @@ mig_internal novalue _Xrpc_jack_release_timebase
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_set_timebase_callback_t__conditional__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_timebase_callback_t(__Request__rpc_jack_set_timebase_callback_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_set_timebase_callback_t(__attribute__((__unused__)) __Request__rpc_jack_set_timebase_callback_t *In0P)
 {
 
 	typedef __Request__rpc_jack_set_timebase_callback_t __Request;
@@ -4564,7 +4564,7 @@ mig_internal novalue _Xrpc_jack_set_timebase_callback
 	__AfterRcvRpc(1014, "rpc_jack_set_timebase_callback")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_get_internal_clientname_t__defined)
 #define __MIG_check__Request__rpc_jack_get_internal_clientname_t__defined
@@ -4689,7 +4689,7 @@ mig_internal novalue _Xrpc_jack_set_timebase_callback
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_get_internal_clientname_t__int_ref__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_get_internal_clientname_t(__Request__rpc_jack_get_internal_clientname_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_get_internal_clientname_t(__attribute__((__unused__)) __Request__rpc_jack_get_internal_clientname_t *In0P)
 {
 
 	typedef __Request__rpc_jack_get_internal_clientname_t __Request;
@@ -4813,7 +4813,7 @@ mig_internal novalue _Xrpc_jack_get_internal_clientname
 	__AfterRcvRpc(1015, "rpc_jack_get_internal_clientname")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_internal_clienthandle_t__defined)
 #define __MIG_check__Request__rpc_jack_internal_clienthandle_t__defined
@@ -4938,7 +4938,7 @@ mig_internal novalue _Xrpc_jack_get_internal_clientname
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clienthandle_t(__Request__rpc_jack_internal_clienthandle_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clienthandle_t(__attribute__((__unused__)) __Request__rpc_jack_internal_clienthandle_t *In0P)
 {
 
 	typedef __Request__rpc_jack_internal_clienthandle_t __Request;
@@ -5063,7 +5063,7 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle
 	__AfterRcvRpc(1016, "rpc_jack_internal_clienthandle")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_internal_clientload_t__defined)
 #define __MIG_check__Request__rpc_jack_internal_clientload_t__defined
@@ -5368,7 +5368,7 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__options__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clientload_t(__Request__rpc_jack_internal_clientload_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clientload_t(__attribute__((__unused__)) __Request__rpc_jack_internal_clientload_t *In0P)
 {
 
 	typedef __Request__rpc_jack_internal_clientload_t __Request;
@@ -5535,7 +5535,7 @@ mig_internal novalue _Xrpc_jack_internal_clientload
 	__AfterRcvRpc(1017, "rpc_jack_internal_clientload")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_internal_clientunload_t__defined)
 #define __MIG_check__Request__rpc_jack_internal_clientunload_t__defined
@@ -5660,7 +5660,7 @@ mig_internal novalue _Xrpc_jack_internal_clientload
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clientunload_t__int_ref__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clientunload_t(__Request__rpc_jack_internal_clientunload_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clientunload_t(__attribute__((__unused__)) __Request__rpc_jack_internal_clientunload_t *In0P)
 {
 
 	typedef __Request__rpc_jack_internal_clientunload_t __Request;
@@ -5784,7 +5784,7 @@ mig_internal novalue _Xrpc_jack_internal_clientunload
 	__AfterRcvRpc(1018, "rpc_jack_internal_clientunload")
 }
 
-#if (__MigTypeCheck || __NDR_convert__ )
+#if ( __MigTypeCheck || __NDR_convert__ )
 #if __MIG_check__Request__JackRPCEngine_subsystem__
 #if !defined(__MIG_check__Request__rpc_jack_client_rt_notify_t__defined)
 #define __MIG_check__Request__rpc_jack_client_rt_notify_t__defined
@@ -5969,7 +5969,7 @@ mig_internal novalue _Xrpc_jack_internal_clientunload
 #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_rt_notify_t__value__defined */
 
 
-mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_rt_notify_t(__Request__rpc_jack_client_rt_notify_t *In0P)
+mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_rt_notify_t(__attribute__((__unused__)) __Request__rpc_jack_client_rt_notify_t *In0P)
 {
 
 	typedef __Request__rpc_jack_client_rt_notify_t __Request;

macosx/RPC/JackRPCEngineUser.c

@@ -1,7 +1,7 @@
 /*
  * IDENTIFICATION:
- * stub generated Thu Oct 25 10:49:38 2007
- * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com
+ * stub generated Thu Jan  3 14:42:41 2008
+ * with a MiG generated Sun Sep 23 15:44:06 PDT 2007 by root@hoosier.apple.com
  * OPTIONS: 
  */
 #define	__MIG_check__Reply__JackRPCEngine_subsystem__ 1
@@ -482,7 +482,6 @@ mig_external kern_return_t rpc_jack_client_open
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -594,7 +593,6 @@ mig_external kern_return_t rpc_jack_client_open
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -910,7 +908,6 @@ mig_external kern_return_t rpc_jack_client_check
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -1017,7 +1014,6 @@ mig_external kern_return_t rpc_jack_client_check
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -1179,7 +1175,6 @@ mig_external kern_return_t rpc_jack_client_close
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -1272,7 +1267,6 @@ mig_external kern_return_t rpc_jack_client_close
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -1434,7 +1428,6 @@ mig_external kern_return_t rpc_jack_client_activate
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -1527,7 +1520,6 @@ mig_external kern_return_t rpc_jack_client_activate
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -1689,7 +1681,6 @@ mig_external kern_return_t rpc_jack_client_deactivate
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -1782,7 +1773,6 @@ mig_external kern_return_t rpc_jack_client_deactivate
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -2024,7 +2014,6 @@ mig_external kern_return_t rpc_jack_port_register
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -2133,7 +2122,6 @@ mig_external kern_return_t rpc_jack_port_register
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -2296,7 +2284,6 @@ mig_external kern_return_t rpc_jack_port_unregister
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -2392,7 +2379,6 @@ mig_external kern_return_t rpc_jack_port_unregister
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -2556,7 +2542,6 @@ mig_external kern_return_t rpc_jack_port_connect
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -2655,7 +2640,6 @@ mig_external kern_return_t rpc_jack_port_connect
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -2819,7 +2803,6 @@ mig_external kern_return_t rpc_jack_port_disconnect
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -2918,7 +2901,6 @@ mig_external kern_return_t rpc_jack_port_disconnect
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -3082,7 +3064,6 @@ mig_external kern_return_t rpc_jack_port_connect_name
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -3181,7 +3162,6 @@ mig_external kern_return_t rpc_jack_port_connect_name
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -3345,7 +3325,6 @@ mig_external kern_return_t rpc_jack_port_disconnect_name
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -3444,7 +3423,6 @@ mig_external kern_return_t rpc_jack_port_disconnect_name
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -3606,7 +3584,6 @@ mig_external kern_return_t rpc_jack_set_buffer_size
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -3699,7 +3676,6 @@ mig_external kern_return_t rpc_jack_set_buffer_size
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -3861,7 +3837,6 @@ mig_external kern_return_t rpc_jack_set_freewheel
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -3954,7 +3929,6 @@ mig_external kern_return_t rpc_jack_set_freewheel
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -4116,7 +4090,6 @@ mig_external kern_return_t rpc_jack_release_timebase
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -4209,7 +4182,6 @@ mig_external kern_return_t rpc_jack_release_timebase
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -4372,7 +4344,6 @@ mig_external kern_return_t rpc_jack_set_timebase_callback
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -4468,7 +4439,6 @@ mig_external kern_return_t rpc_jack_set_timebase_callback
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -4707,7 +4677,6 @@ mig_external kern_return_t rpc_jack_get_internal_clientname
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -4807,7 +4776,6 @@ mig_external kern_return_t rpc_jack_get_internal_clientname
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -5122,7 +5090,6 @@ mig_external kern_return_t rpc_jack_internal_clienthandle
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -5226,7 +5193,6 @@ mig_external kern_return_t rpc_jack_internal_clienthandle
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -5544,7 +5510,6 @@ mig_external kern_return_t rpc_jack_internal_clientload
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -5657,7 +5622,6 @@ mig_external kern_return_t rpc_jack_internal_clientload
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 #if ( __MigTypeCheck || __NDR_convert__ )
@@ -5896,7 +5860,6 @@ mig_external kern_return_t rpc_jack_internal_clientunload
 	int *result
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -5996,7 +5959,6 @@ mig_external kern_return_t rpc_jack_internal_clientunload
 	*result = Out0P->result;
 
 	return KERN_SUCCESS;
-    }
 }
 
 /* SimpleRoutine rpc_jack_client_rt_notify */
@@ -6009,7 +5971,6 @@ mig_external kern_return_t rpc_jack_client_rt_notify
 	int timeout
 )
 {
-    {
 
 #ifdef  __MigPackStructs
 #pragma pack(4)
@@ -6064,7 +6025,9 @@ mig_external kern_return_t rpc_jack_client_rt_notify
 	__BeforeSendSimple(1019, "rpc_jack_client_rt_notify")
 	msg_result = mach_msg(&InP->Head, MACH_SEND_MSG|MACH_SEND_TIMEOUT|MACH_MSG_OPTION_NONE, (mach_msg_size_t)sizeof(Request), 0, MACH_PORT_NULL, timeout, MACH_PORT_NULL);
 	__AfterSendSimple(1019, "rpc_jack_client_rt_notify")
-		return msg_result;
-	return KERN_SUCCESS;
-    }
+
+	if (msg_result == MACH_SEND_TIMED_OUT) {
+	}
+
+	return msg_result;
 }