From b8d8e357664be71daa0b8063776ddc7137e82c8d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 20 Aug 2004 18:57:01 +0000 Subject: [PATCH] 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... --- include/SDL_audio.h | 4 ++-- include/SDL_events.h | 2 +- include/SDL_rwops.h | 8 ++++---- include/SDL_thread.h | 2 +- src/main/beos/exports/genexp.pl | 2 +- src/main/macos/exports/gendef.pl | 2 +- src/main/macosx/exports/gendef.pl | 2 +- src/main/win32/exports/gendef.pl | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/SDL_audio.h b/include/SDL_audio.h index 41873e24c..2bf0ce9d2 100644 --- a/include/SDL_audio.h +++ b/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; diff --git a/include/SDL_events.h b/include/SDL_events.h index 880a37540..622b91510 100644 --- a/include/SDL_events.h +++ b/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 diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index 89412f53c..64dd46e0e 100644 --- a/include/SDL_rwops.h +++ b/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 { diff --git a/include/SDL_thread.h b/include/SDL_thread.h index 5244dff27..abf81f273 100644 --- a/include/SDL_thread.h +++ b/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); diff --git a/src/main/beos/exports/genexp.pl b/src/main/beos/exports/genexp.pl index feeda2b24..98331bba2 100755 --- a/src/main/beos/exports/genexp.pl +++ b/src/main/beos/exports/genexp.pl @@ -9,7 +9,7 @@ } $file =~ s,.*/,,; while () { - if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) { + if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { print "_$1\n"; } } diff --git a/src/main/macos/exports/gendef.pl b/src/main/macos/exports/gendef.pl index 6501b7534..72f6bf453 100644 --- a/src/main/macos/exports/gendef.pl +++ b/src/main/macos/exports/gendef.pl @@ -10,7 +10,7 @@ $printed_header = 0; $file =~ s,.*/,,; while () { - if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) { + if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { print "\t$1\n"; } } diff --git a/src/main/macosx/exports/gendef.pl b/src/main/macosx/exports/gendef.pl index 80008cb7f..8793278ca 100644 --- a/src/main/macosx/exports/gendef.pl +++ b/src/main/macosx/exports/gendef.pl @@ -14,7 +14,7 @@ $printed_header = 0; $file =~ s,.*/,,; while () { - if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) { + if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { print "\t_$1\n"; } } diff --git a/src/main/win32/exports/gendef.pl b/src/main/win32/exports/gendef.pl index 8a25b4def..4fed9bc1f 100755 --- a/src/main/win32/exports/gendef.pl +++ b/src/main/win32/exports/gendef.pl @@ -10,7 +10,7 @@ $printed_header = 0; $file =~ s,.*/,,; while () { - if ( / DECLSPEC.*SDLCALL ([^\s\(]+)/ ) { + if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { print "\t$1\n"; } }