diff -up Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.dprintf Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc --- Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.dprintf 2007-03-11 19:56:13.000000000 -0400 +++ Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc 2009-07-20 22:44:53.000000000 -0400 @@ -33,6 +33,8 @@ * Last edited: 2007-03-11 14:17:34 by piumarta on emilia.local */ +#include "debug.h" + /*** MIDI Parameters (used with sqMIDIParameter function) ***/ /* TODO: Why is this not in Cross/plugins/MIDIPlugin/MIDIPlugin.h ??? */ @@ -184,7 +186,7 @@ int sqMIDIClosePort(int portNum) */ int sqMIDIGetClock(void) { - dprintf("sqMIDIGetClock\n"); + dprintf(("sqMIDIGetClock\n")); success(false); return 0; } @@ -196,7 +198,7 @@ int sqMIDIGetClock(void) */ int sqMIDIGetPortCount(void) { - dprintf("sqMIDIGetPortCount\n"); + dprintf(("sqMIDIGetPortCount\n")); success(true); return 1; } @@ -244,7 +246,7 @@ int sqMIDIGetPortName(int portNum, int n */ int sqMIDIOpenPort(int portNum, int readSemaIndex, int interfaceClockRate) { - dprintf("sqMIDIOpenPort(%d, %d, %d)\n", portNum, readSemaIndex, interfaceClockRate); + dprintf(("sqMIDIOpenPort(%d, %d, %d)\n", portNum, readSemaIndex, interfaceClockRate)); int type= SND_SEQ_PORT_TYPE_APPLICATION; switch (portNum) @@ -406,7 +408,7 @@ int sqMIDIParameter(int whichParameter, */ int sqMIDIPortReadInto(int portNum, int count, int bufferPtr) { - dprintf("sqMIDIPortRead\n"); + dprintf(("sqMIDIPortRead\n")); success(false); return 0; } @@ -426,9 +428,9 @@ int sqMIDIPortWriteFromAt(int portNum, i snd_seq_event_t ev; unsigned char *bytePtr= (unsigned char *)bufferPtr; - dprintf("Port %d Write:", portNum); - for (i= 0; i < count; ++i) dprintf(" %d", (int)bytePtr[i]); - dprintf(" at %d\n", time); + dprintf(("Port %d Write:", portNum)); + for (i= 0; i < count; ++i) dprintf((" %d", (int)bytePtr[i])); + dprintf((" at %d\n", time)); snd_seq_ev_clear(&ev); snd_seq_ev_set_source(&ev, out_port); @@ -483,7 +485,7 @@ int sqMIDIParameterGet(int whichParamete int midiShutdown(void) { - dprintf("midiShutdown\n"); + dprintf(("midiShutdown\n")); success(false); return 0; } @@ -496,12 +498,12 @@ static void performMIDICmd(snd_seq_event switch (cmd) { case 128: /* note off */ - dprintf("Note off %d, %d\n", ch, arg1); + dprintf(("Note off %d, %d\n", ch, arg1)); snd_seq_ev_set_noteoff(ev, ch, arg1, 0); break; case 144: /* note on */ - dprintf("Note on %d, %d, %d\n", ch, arg1, arg2); + dprintf(("Note on %d, %d, %d\n", ch, arg1, arg2)); snd_seq_ev_set_noteon(ev, ch, arg1, arg2); break; diff -up Squeak-3.10-5/platforms/unix/vm/debug.c.dprintf Squeak-3.10-5/platforms/unix/vm/debug.c --- Squeak-3.10-5/platforms/unix/vm/debug.c.dprintf 2006-09-14 13:52:28.000000000 -0400 +++ Squeak-3.10-5/platforms/unix/vm/debug.c 2009-07-20 22:45:00.000000000 -0400 @@ -1,9 +1,10 @@ -#include "debug.h" #include #include #include +#include "debug.h" + void __sq_dprintf(const char *fmt, ...) { va_list ap; diff -up Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c.dprintf Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c --- Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c.dprintf 2009-04-29 12:32:52.000000000 -0400 +++ Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c 2009-07-20 22:45:05.000000000 -0400 @@ -67,16 +67,11 @@ # define DEBUG 0 #endif - -static void dprintf(const char *fmt, ...) -{ -#if (DEBUG) - va_list ap; - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); +#ifdef DEBUG +# define dprintf printf +#else + static void dprintf(char *fmt, ...) {} #endif -} static void fatalError(const char *who) { diff -up Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c.dprintf Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c --- Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c.dprintf 2006-10-18 13:03:56.000000000 -0400 +++ Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c 2009-07-20 22:45:11.000000000 -0400 @@ -508,7 +508,7 @@ static void fb_initVisual(_self) self->size= fb_height(self) * self->fix.line_length; self->pitch= self->fix.line_length / self->var.bits_per_pixel * 8; - dprintf("%s: %dx%dx%d+%x+%x (%dx%d) %s, rgb %d+%d %d+%d %d+%d pitch %d(%d)\n", self->fbName, + dprintf("%s: %dx%dx%d+%x+%x (%dx%d) %s, rgb %d+%d %d+%d %d+%d pitch %d(%ld)\n", self->fbName, self->var.xres, self->var.yres, self->var.bits_per_pixel, self->var.xoffset, self->var.yoffset, self->var.xres_virtual, self->var.yres_virtual, visualName(self),