[PATCH] 64bit build cleanups

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] 64bit build cleanups

Andreas Steinmetz
[please cc me on replies, I'm not subscribed]

Attached are some minor build cleanups against jack 0.100.0 that fix
warnings when building jack on 64bit.
--
Andreas Steinmetz                       SPAMmers use [hidden email]

diff -rNu --exclude=doc --exclude=jackd.1 --exclude=version.h jack-audio-connection-kit-0.100.0.orig/drivers/oss/oss_driver.c jack-audio-connection-kit-0.100.0/drivers/oss/oss_driver.c
--- jack-audio-connection-kit-0.100.0.orig/drivers/oss/oss_driver.c 2005-06-02 20:30:34.000000000 +0200
+++ jack-audio-connection-kit-0.100.0/drivers/oss/oss_driver.c 2005-07-20 08:28:43.000000000 +0200
@@ -663,7 +663,7 @@
  driver->outdevbuf = NULL;
  }
 
- printf("oss_driver: indevbuf %u B, outdevbuf %u B\n",
+ printf("oss_driver: indevbuf %lu B, outdevbuf %lu B\n",
  driver->indevbufsize, driver->outdevbufsize);
 
  pthread_mutex_init(&driver->mutex_in, NULL);
diff -rNu --exclude=doc --exclude=jackd.1 --exclude=version.h jack-audio-connection-kit-0.100.0.orig/jack/shm.h jack-audio-connection-kit-0.100.0/jack/shm.h
--- jack-audio-connection-kit-0.100.0.orig/jack/shm.h 2004-12-26 06:23:02.000000000 +0100
+++ jack-audio-connection-kit-0.100.0/jack/shm.h 2005-07-20 03:19:24.000000000 +0200
@@ -24,7 +24,7 @@
 typedef char   shm_name_t[SHM_NAME_MAX];
 typedef shm_name_t jack_shm_id_t;
 #else /* System V SHM */
-typedef int   jack_shm_id_t;
+typedef long   jack_shm_id_t;
 #endif /* SHM type */
 
 /* shared memory type */
diff -rNu --exclude=doc --exclude=jackd.1 --exclude=version.h jack-audio-connection-kit-0.100.0.orig/libjack/unlock.c jack-audio-connection-kit-0.100.0/libjack/unlock.c
--- jack-audio-connection-kit-0.100.0.orig/libjack/unlock.c 2005-05-03 15:31:52.000000000 +0200
+++ jack-audio-connection-kit-0.100.0/libjack/unlock.c 2005-07-20 08:27:26.000000000 +0200
@@ -73,7 +73,7 @@
 
  unlock = 0;
 
- if (fscanf (map, "%x-%x %*s %*x %*d:%*d %d",
+ if (fscanf (map, "%lx-%lx %*s %*x %*d:%*d %d",
     &start, &end, &whoknows) != 3) {
  break;
  }