64 bits compilation on Windows.

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

8 files changed, 31 insertions, 25 deletions

diff --git a/common/JackChannel.h b/common/JackChannel.h
index a0bcfe63..69d25e00 100644
--- a/common/JackChannel.h
+++ b/common/JackChannel.h
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "types.h"
 #include "JackSession.h"
-//#include "session.h"
 
 namespace Jack
 {
diff --git a/common/JackClient.h b/common/JackClient.h
index 8a7a9249..7d8e0864 100644
--- a/common/JackClient.h
+++ b/common/JackClient.h
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSynchro.h"
 #include "JackPlatformPlug.h"
 #include "JackChannel.h"
-//#include "session.h"
 #include "varargs.h"
 #include <list>
 
diff --git a/common/JackClientControl.h b/common/JackClientControl.h
index 281d6b62..d035ccd0 100644
--- a/common/JackClientControl.h
+++ b/common/JackClientControl.h
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSynchro.h"
 #include "JackNotification.h"
 #include "JackSession.h"
-//#include "session.h"
 
 namespace Jack
 {
diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index c3ddec54..555a8599 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -215,7 +215,8 @@ bool
 jackctl_add_driver_parameters(
     struct jackctl_driver * driver_ptr)
 {
-    uint32_t i;
+    int i;

+
     union jackctl_parameter_value jackctl_value;
     jackctl_param_type_t jackctl_type;
     struct jackctl_parameter * parameter_ptr;
diff --git a/common/JackControlAPI.h b/common/JackControlAPI.h
index 8e87d513..65b8528e 100644
--- a/common/JackControlAPI.h
+++ b/common/JackControlAPI.h
@@ -27,7 +27,8 @@
 
 #ifdef WIN32
 #ifdef __MINGW32__
-#include <sys/types.h>
+#include <sys/types.h>

+typedef _sigset_t	sigset_t;
 #else
 typedef HANDLE sigset_t;
 #endif
@@ -169,11 +170,11 @@ jackctl_parameter_set_value(
 EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
 	jackctl_parameter_t * parameter);
-    
-EXPORT union jackctl_parameter_value 
+
+EXPORT union jackctl_parameter_value
 jackctl_parameter_get_default_value(
     jackctl_parameter *parameter_ptr);
-    
+
 EXPORT bool
 jackctl_parameter_has_range_constraint(
 	jackctl_parameter_t * parameter_ptr);
@@ -210,33 +211,33 @@ EXPORT bool
 jackctl_parameter_constraint_is_fake_value(
 	jackctl_parameter_t * parameter_ptr);
 
-EXPORT const JSList * 
+EXPORT const JSList *
 jackctl_server_get_internals_list(
     jackctl_server *server_ptr);
-    
-EXPORT const char * 
+
+EXPORT const char *
 jackctl_internal_get_name(
     jackctl_internal *internal_ptr);
-    
-EXPORT const JSList * 
+
+EXPORT const JSList *
 jackctl_internal_get_parameters(
     jackctl_internal *internal_ptr);
-    
+
 EXPORT bool jackctl_server_load_internal(
     jackctl_server * server,
     jackctl_internal * internal);
-    
+
 EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server,
     jackctl_internal * internal);
-    
+
 EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
 EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-EXPORT bool 
+EXPORT bool
 jackctl_server_switch_master(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
diff --git a/common/JackLibGlobals.h b/common/JackLibGlobals.h
index 8d312295..f95739d6 100644
--- a/common/JackLibGlobals.h
+++ b/common/JackLibGlobals.h
@@ -32,6 +32,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <assert.h>
 #include <signal.h>
 
+#ifdef __MINGW32__
+#include <sys/types.h>
+typedef _sigset_t sigset_t;
+#else
+typedef HANDLE sigset_t;
+#endif
 
 namespace Jack
 {
diff --git a/common/JackPort.h b/common/JackPort.h
index 8e8c1667..88edf1ba 100644
--- a/common/JackPort.h
+++ b/common/JackPort.h
@@ -107,7 +107,7 @@ class SERVER_EXPORT JackPort
         // Since we are in shared memory, the resulting pointer cannot be cached, so align it here...
         jack_default_audio_sample_t* GetBuffer()
         {
-            return (jack_default_audio_sample_t*)((long)fBuffer & ~15L) + 4;
+            return (jack_default_audio_sample_t*)((uintptr_t)fBuffer & ~15L) + 4;
         }
 
         int GetRefNum() const;
diff --git a/windows/JackNetWinSocket.h b/windows/JackNetWinSocket.h
index bd303eff..1041fab8 100644
--- a/windows/JackNetWinSocket.h
+++ b/windows/JackNetWinSocket.h
@@ -1,20 +1,20 @@
 /*
  Copyright (C) 2004-2008 Grame
- 
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 2.1 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
- 
+
  You should have received a copy of the GNU Lesser General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
+
  */
 
 #ifndef __JackNetWinSocket__
@@ -23,7 +23,8 @@
 #include "JackNetSocket.h"
 #ifdef __MINGW32__
 #include <winsock2.h>
-#include <ws2tcpip.h>
+#include <ws2tcpip.h>

+#include <stdint.h>
 #endif
 
 
@@ -31,9 +32,9 @@ namespace Jack
 {
 #define E(code, s) { code, s }
 #define NET_ERROR_CODE WSAGetLastError()
-#define StrError PrintError
+#define StrError PrintError

 
-    typedef uint32_t uint;
+    typedef uint32_t uint;

     typedef int SOCKLEN;
     typedef struct _win_net_error win_net_error_t;