Date: Fri, 20 Aug 2004 08:31:20 +0200

From: "Markus F.X.J. Oberhumer"
Subject: [SDL-CVS][patch] add missing SDLCALL to headers

the small patch attached below (against current CVS) adds some missing SDLCALL
decorations to callback types and arguments.

Unfortunately one of these changes breaks your gen{def,exp}.pl scripts which
should be changed to use non-greedy regular expression matching...

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40931

include/SDL_audio.h

@@ -59,7 +59,7 @@ typedef struct SDL_AudioSpec {
 	   Once the callback returns, the buffer will no longer be valid.
 	   Stereo samples are stored in a LRLRLR ordering.
 	*/
-	void (*callback)(void *userdata, Uint8 *stream, int len);
+	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
 	void  *userdata;
 } SDL_AudioSpec;
 
@@ -94,7 +94,7 @@ typedef struct SDL_AudioCVT {
 	int    len_cvt;			/* Length of converted audio buffer */
 	int    len_mult;		/* buffer must be len*len_mult big */
 	double len_ratio; 	/* Given len, final size is len*len_ratio */
-	void (*filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
+	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
 	int filter_index;		/* Current audio conversion function */
 } SDL_AudioCVT;
 

include/SDL_events.h

@@ -285,7 +285,7 @@ extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);
 
   The filter is protypted as:
 */
-typedef int (*SDL_EventFilter)(const SDL_Event *event);
+typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
 /*
   If the filter returns 1, then the event will be added to the internal queue.
   If it returns 0, then the event will be dropped from the queue, but the 

include/SDL_rwops.h

@@ -49,22 +49,22 @@ typedef struct SDL_RWops {
 		SEEK_SET, SEEK_CUR, SEEK_END
 	   Returns the final offset in the data source.
 	 */
-	int (*seek)(struct SDL_RWops *context, int offset, int whence);
+	int (SDLCALL *seek)(struct SDL_RWops *context, int offset, int whence);
 
 	/* Read up to 'num' objects each of size 'objsize' from the data
 	   source to the area pointed at by 'ptr'.
 	   Returns the number of objects read, or -1 if the read failed.
 	 */
-	int (*read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);
+	int (SDLCALL *read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);
 
 	/* Write exactly 'num' objects each of size 'objsize' from the area
 	   pointed at by 'ptr' to data source.
 	   Returns 'num', or -1 if the write failed.
 	 */
-	int (*write)(struct SDL_RWops *context, const void *ptr, int size, int num);
+	int (SDLCALL *write)(struct SDL_RWops *context, const void *ptr, int size, int num);
 
 	/* Close and free an allocated SDL_FSops structure */
-	int (*close)(struct SDL_RWops *context);
+	int (SDLCALL *close)(struct SDL_RWops *context);
 
 	Uint32 type;
 	union {

include/SDL_thread.h

@@ -50,7 +50,7 @@ struct SDL_Thread;
 typedef struct SDL_Thread SDL_Thread;
 
 /* Create a thread */
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data);
+extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data);
 
 /* Get the 32-bit thread identifier for the current thread */
 extern DECLSPEC Uint32 SDLCALL SDL_ThreadID(void);

src/main/beos/exports/genexp.pl

@@ -9,7 +9,7 @@ while ( ($file = shift(@ARGV)) ) {
 	}
 	$file =~ s,.*/,,;
 	while (<FILE>) {
-		if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) {
+		if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) {
 			print "_$1\n";
 		}
 	}

src/main/macos/exports/gendef.pl

@@ -10,7 +10,7 @@ while ( ($file = shift(@ARGV)) ) {
 	$printed_header = 0;
 	$file =~ s,.*/,,;
 	while (<FILE>) {
-		if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) {
+		if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) {
 			print "\t$1\n";
 		}
 	}

src/main/macosx/exports/gendef.pl

@@ -14,7 +14,7 @@ while ( ($file = shift(@ARGV)) ) {
 	$printed_header = 0;
 	$file =~ s,.*/,,;
 	while (<FILE>) {
-		if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) {
+		if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) {
 			print "\t_$1\n";
 		}
 	}

src/main/win32/exports/gendef.pl

@@ -10,7 +10,7 @@ while ( ($file = shift(@ARGV)) ) {
 	$printed_header = 0;
 	$file =~ s,.*/,,;
 	while (<FILE>) {
-		if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) {
+		if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) {
 			print "\t$1\n";
 		}
 	}