| 1 | Avoid implicit ints and implicit function declarations, to prevent
|
| 2 | build failures with future compilers which do not support them.
|
| 3 |
|
| 4 | diff --git a/bristol/bristolmemorymoog.c b/bristol/bristolmemorymoog.c
|
| 5 | index 6c58e4d92253a232..f51d684729f55b11 100644
|
| 6 | |
| 7 | |
| 8 | @@ -33,6 +33,7 @@
|
| 9 | #include "bristolmemorymoog.h"
|
| 10 |
|
| 11 | extern int buildCurrentTable(Baudio *, float);
|
| 12 | +extern void doPitchWheel(Baudio *);
|
| 13 |
|
| 14 | /*
|
| 15 | * Use of these memorymoog global buffers will be an issue with use of multiple
|
| 16 | diff --git a/libbrightonC11/bRoutines.c b/libbrightonC11/bRoutines.c
|
| 17 | index 1983db220c0825ba..88d1e64a51a1e145 100644
|
| 18 | |
| 19 | |
| 20 | @@ -24,6 +24,7 @@
|
| 21 |
|
| 22 | void *
|
| 23 | brightonX11malloc(size)
|
| 24 | +int size;
|
| 25 | {
|
| 26 | void *mem;
|
| 27 |
|
| 28 | diff --git a/libbrightonX11/bRoutines.c b/libbrightonX11/bRoutines.c
|
| 29 | index 87dab9a93223ef0f..647f57181cdf4692 100644
|
| 30 | |
| 31 | |
| 32 | @@ -25,6 +25,7 @@
|
| 33 |
|
| 34 | void *
|
| 35 | brightonX11malloc(size)
|
| 36 | +int size;
|
| 37 | {
|
| 38 | void *mem;
|
| 39 |
|
| 40 | diff --git a/libbristol/bristolcdefs.c b/libbristol/bristolcdefs.c
|
| 41 | index a5f0638155fe40e3..45ccd11604ac37b8 100644
|
| 42 | |
| 43 | |
| 44 | @@ -25,6 +25,7 @@
|
| 45 |
|
| 46 | void *
|
| 47 | bristolmalloc(size)
|
| 48 | +int size;
|
| 49 | {
|
| 50 | char *mem;
|
| 51 |
|
| 52 | @@ -39,6 +40,7 @@ bristolmalloc(size)
|
| 53 |
|
| 54 | void *
|
| 55 | bristolmalloc0(size)
|
| 56 | +int size;
|
| 57 | {
|
| 58 | char *mem;
|
| 59 |
|
| 60 | diff --git a/libbristolaudio/audioEngine.c b/libbristolaudio/audioEngine.c
|
| 61 | index d6aeb4b8976a1a84..e0367fc427b5dbc6 100644
|
| 62 | |
| 63 | |
| 64 | @@ -85,6 +85,7 @@ int
|
| 65 | initAudioDevice2(audioDev, devID, fragSize)
|
| 66 | duplexDev *audioDev;
|
| 67 | int devID;
|
| 68 | +int fragSize;
|
| 69 | {
|
| 70 | /*
|
| 71 | * The device is basically just opened for the first call of this routine.
|
| 72 | @@ -118,6 +119,7 @@ int devID;
|
| 73 | int
|
| 74 | setAudioStart2(audioDev, devID)
|
| 75 | duplexDev *audioDev;
|
| 76 | +int devID;
|
| 77 | {
|
| 78 | int enable;
|
| 79 |
|
| 80 | @@ -162,6 +164,7 @@ duplexDev *audioDev;
|
| 81 | int
|
| 82 | setAudioStop2(audioDev, devID)
|
| 83 | duplexDev *audioDev;
|
| 84 | +int devID;
|
| 85 | {
|
| 86 | int enable;
|
| 87 |
|
| 88 | diff --git a/libbristolaudio/audioEngineOSS.c b/libbristolaudio/audioEngineOSS.c
|
| 89 | index 26d9f89923bc7fb0..984b30efd4af9c2c 100644
|
| 90 | |
| 91 | |
| 92 | @@ -49,6 +49,7 @@ int
|
| 93 | ossAudioInit(audioDev, devID, fragSize)
|
| 94 | duplexDev *audioDev;
|
| 95 | int devID;
|
| 96 | +int fragSize;
|
| 97 | {
|
| 98 | #if (BRISTOL_HAS_OSS == 1)
|
| 99 | int results, data = 0, mode;
|
| 100 | diff --git a/libbristolaudio/audioGUI.c b/libbristolaudio/audioGUI.c
|
| 101 | index bd9410650b361101..bbdf5c68e6264569 100644
|
| 102 | |
| 103 | |
| 104 | @@ -161,6 +161,7 @@ duplexDev *audioDev;
|
| 105 | char *
|
| 106 | getControllerName(audioDev, controller)
|
| 107 | duplexDev *audioDev;
|
| 108 | +int controller;
|
| 109 | {
|
| 110 | #if (BRISTOL_HAS_ALSA == 1)
|
| 111 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 112 | @@ -173,6 +174,8 @@ duplexDev *audioDev;
|
| 113 | int
|
| 114 | setRecordSource(audioDev, controller, position)
|
| 115 | duplexDev *audioDev;
|
| 116 | +int controller;
|
| 117 | +int position;
|
| 118 | {
|
| 119 | #if (BRISTOL_HAS_ALSA == 1)
|
| 120 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 121 | @@ -185,6 +188,7 @@ duplexDev *audioDev;
|
| 122 | int
|
| 123 | getRecordability(audioDev, controller)
|
| 124 | duplexDev *audioDev;
|
| 125 | +int controller;
|
| 126 | {
|
| 127 | #if (BRISTOL_HAS_ALSA == 1)
|
| 128 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 129 | @@ -197,6 +201,7 @@ duplexDev *audioDev;
|
| 130 | int
|
| 131 | getMutability(audioDev, controller)
|
| 132 | duplexDev *audioDev;
|
| 133 | +int controller;
|
| 134 | {
|
| 135 | #if (BRISTOL_HAS_ALSA == 1)
|
| 136 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 137 | @@ -211,6 +216,7 @@ duplexDev *audioDev;
|
| 138 | int
|
| 139 | getStereoStatus(audioDev, controller)
|
| 140 | duplexDev *audioDev;
|
| 141 | +int controller;
|
| 142 | {
|
| 143 | #if (BRISTOL_HAS_ALSA == 1)
|
| 144 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 145 | @@ -222,6 +228,8 @@ duplexDev *audioDev;
|
| 146 | int
|
| 147 | getValue(audioDev, controller, side)
|
| 148 | duplexDev *audioDev;
|
| 149 | +int controller;
|
| 150 | +int side;
|
| 151 | {
|
| 152 | #if (BRISTOL_HAS_ALSA == 1)
|
| 153 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 154 | @@ -233,6 +241,9 @@ duplexDev *audioDev;
|
| 155 | int
|
| 156 | setAudioValue(audioDev, controller, side, value)
|
| 157 | duplexDev *audioDev;
|
| 158 | +int controller;
|
| 159 | +int side;
|
| 160 | +int value;
|
| 161 | {
|
| 162 | if (audioDev->cflags & SLAB_AUDIODBG)
|
| 163 | printf("setAudioValue(%p, %i, %i, %i)\n", audioDev, controller, side, value);
|
| 164 | @@ -251,6 +262,8 @@ duplexDev *audioDev;
|
| 165 | int
|
| 166 | setAudioMute(audioDev, controller, value)
|
| 167 | duplexDev *audioDev;
|
| 168 | +int controller;
|
| 169 | +int value;
|
| 170 | {
|
| 171 | if (audioDev->cflags & SLAB_AUDIODBG)
|
| 172 | printf("setAudioMute()\n");
|
| 173 | @@ -280,6 +293,7 @@ char *name;
|
| 174 | int
|
| 175 | getAudioCapability(audioDev, controller)
|
| 176 | duplexDev *audioDev;
|
| 177 | +int controller;
|
| 178 | {
|
| 179 | if (audioDev->cflags & SLAB_AUDIODBG)
|
| 180 | printf("getAudioCapability(%s, %i)\n", audioDev->devName, controller);
|
| 181 | @@ -296,6 +310,7 @@ duplexDev *audioDev;
|
| 182 | int
|
| 183 | validDev(audioDev, index)
|
| 184 | duplexDev *audioDev;
|
| 185 | +int index;
|
| 186 | {
|
| 187 | #if (BRISTOL_HAS_ALSA == 1)
|
| 188 | if ((audioDev->flags & AUDIO_ALSA) != 0)
|
| 189 | diff --git a/libbristolaudio/audioGUIOSS.c b/libbristolaudio/audioGUIOSS.c
|
| 190 | index d6e66d4ab7b72290..74dd973680d93fd0 100644
|
| 191 | |
| 192 | |
| 193 | @@ -91,7 +91,11 @@ short left, right;
|
| 194 | */
|
| 195 | static int
|
| 196 | setAudioOSS(fd, audioDev, param, valueL, valueR)
|
| 197 | +int fd;
|
| 198 | duplexDev *audioDev;
|
| 199 | +int param;
|
| 200 | +int valueL;
|
| 201 | +int valueR;
|
| 202 | {
|
| 203 | #if (BRISTOL_HAS_OSS == 1)
|
| 204 | int value, command;
|
| 205 | @@ -259,6 +263,7 @@ char *name;
|
| 206 | int
|
| 207 | getOSSCapability(audioDev, controller)
|
| 208 | duplexDev *audioDev;
|
| 209 | +int controller;
|
| 210 | {
|
| 211 | if ((audioDev->stereoCaps | audioDev->monoCaps) & (1 << controller))
|
| 212 | return controller;
|
| 213 | @@ -268,6 +273,7 @@ duplexDev *audioDev;
|
| 214 | int
|
| 215 | getOSSRecordability(audioDev, cont)
|
| 216 | duplexDev *audioDev;
|
| 217 | +int cont;
|
| 218 | {
|
| 219 | if (audioDev->cflags & SLAB_AUDIODBG)
|
| 220 | printf("getOSSRecordability(%i, %i)\n", audioDev->devID, cont);
|
| 221 | diff --git a/libbristolmidi/inetClient.c b/libbristolmidi/inetClient.c
|
| 222 | index 17761c7588a9747e..06499763d28f8f2a 100644
|
| 223 | |
| 224 | |
| 225 | @@ -66,6 +66,7 @@ void clientCheckSocket();
|
| 226 | int
|
| 227 | initControlPort(host, port)
|
| 228 | char *host;
|
| 229 | +int port;
|
| 230 | {
|
| 231 | struct sockaddr_in connect_socket_addr;
|
| 232 | char hostname[NAME_LENGTH];
|
| 233 | diff --git a/libbristolmidi/midiRoutines.c b/libbristolmidi/midiRoutines.c
|
| 234 | index 15a5835f09f28fbe..e4458a395fd94036 100644
|
| 235 | |
| 236 | |
| 237 | @@ -85,6 +85,7 @@ bristolMidiDevSanity(int dev)
|
| 238 |
|
| 239 | void
|
| 240 | bristolMidiPrintHandle(handle)
|
| 241 | +int handle;
|
| 242 | {
|
| 243 | printf(" Handle: %i\n", bmidi.handle[handle].handle);
|
| 244 | printf(" State: %i\n", bmidi.handle[handle].state);
|
| 245 | @@ -103,6 +104,7 @@ bristolMidiPrintHandle(handle)
|
| 246 |
|
| 247 | int
|
| 248 | bristolMidiSanity(handle)
|
| 249 | +int handle;
|
| 250 | {
|
| 251 | #ifdef DEBUG
|
| 252 | printf("bristolMidiSanity(%i)\n", handle);
|
| 253 | diff --git a/libbristolmidi/socketToolKit.c b/libbristolmidi/socketToolKit.c
|
| 254 | index 7e4e5b1423905afe..f9b129fd577953c6 100644
|
| 255 | |
| 256 | |
| 257 | @@ -57,7 +57,9 @@ struct sockaddr_un local_socket_addr;
|
| 258 | int
|
| 259 | open_remote_socket(name, port, listens, reqsig)
|
| 260 | char *name; /* service name, must be known */
|
| 261 | +int port;
|
| 262 | int listens; /* Parameter for the number of connections accepted */
|
| 263 | +int reqsig;
|
| 264 | {
|
| 265 | struct servent *service, service_tmp;
|
| 266 | struct sockaddr_in remote_socket_addr;
|