Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
OCD fixes: Adds a space before */
  • Loading branch information
gabomdq committed Aug 21, 2013
1 parent 3984c7d commit 695344d
Show file tree
Hide file tree
Showing 73 changed files with 270 additions and 270 deletions.
2 changes: 1 addition & 1 deletion Xcode-iOS/Demos/src/rectangles.c
Expand Up @@ -37,7 +37,7 @@ render(SDL_Renderer *renderer)
int
main(int argc, char *argv[])
{
if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO*/) < 0)
if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO */) < 0)
{
printf("Unable to initialize SDL");
}
Expand Down
4 changes: 2 additions & 2 deletions include/SDL.h
Expand Up @@ -106,7 +106,7 @@ extern "C" {
* These are the flags which may be passed to SDL_Init(). You should
* specify the subsystems which you will be using in your application.
*/
/*@{*/
/*@{ */
#define SDL_INIT_TIMER 0x00000001
#define SDL_INIT_AUDIO 0x00000010
#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
Expand All @@ -119,7 +119,7 @@ extern "C" {
SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
)
/*@}*/
/*@} */

/**
* This function initializes the subsystems specified by \c flags
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_atomic.h
Expand Up @@ -91,7 +91,7 @@ extern "C" {
* The spin lock functions and type are required and can not be
* emulated because they are used in the atomic emulation code.
*/
/*@{*/
/*@{ */

typedef int SDL_SpinLock;

Expand All @@ -118,7 +118,7 @@ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
*/
extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);

/*@}*//*SDL AtomicLock*/
/*@} *//*SDL AtomicLock */


/**
Expand Down
44 changes: 22 additions & 22 deletions include/SDL_audio.h
Expand Up @@ -66,7 +66,7 @@ typedef Uint16 SDL_AudioFormat;
/**
* \name Audio flags
*/
/*@{*/
/*@{ */

#define SDL_AUDIO_MASK_BITSIZE (0xFF)
#define SDL_AUDIO_MASK_DATATYPE (1<<8)
Expand All @@ -85,7 +85,7 @@ typedef Uint16 SDL_AudioFormat;
*
* Defaults to LSB byte order.
*/
/*@{*/
/*@{ */
#define AUDIO_U8 0x0008 /**< Unsigned 8-bit samples */
#define AUDIO_S8 0x8008 /**< Signed 8-bit samples */
#define AUDIO_U16LSB 0x0010 /**< Unsigned 16-bit samples */
Expand All @@ -94,30 +94,30 @@ typedef Uint16 SDL_AudioFormat;
#define AUDIO_S16MSB 0x9010 /**< As above, but big-endian byte order */
#define AUDIO_U16 AUDIO_U16LSB
#define AUDIO_S16 AUDIO_S16LSB
/*@}*/
/*@} */

/**
* \name int32 support
*/
/*@{*/
/*@{ */
#define AUDIO_S32LSB 0x8020 /**< 32-bit integer samples */
#define AUDIO_S32MSB 0x9020 /**< As above, but big-endian byte order */
#define AUDIO_S32 AUDIO_S32LSB
/*@}*/
/*@} */

/**
* \name float32 support
*/
/*@{*/
/*@{ */
#define AUDIO_F32LSB 0x8120 /**< 32-bit floating point samples */
#define AUDIO_F32MSB 0x9120 /**< As above, but big-endian byte order */
#define AUDIO_F32 AUDIO_F32LSB
/*@}*/
/*@} */

/**
* \name Native audio byte ordering
*/
/*@{*/
/*@{ */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define AUDIO_U16SYS AUDIO_U16LSB
#define AUDIO_S16SYS AUDIO_S16LSB
Expand All @@ -129,21 +129,21 @@ typedef Uint16 SDL_AudioFormat;
#define AUDIO_S32SYS AUDIO_S32MSB
#define AUDIO_F32SYS AUDIO_F32MSB
#endif
/*@}*/
/*@} */

/**
* \name Allow change flags
*
* Which audio format changes are allowed when opening a device.
*/
/*@{*/
/*@{ */
#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001
#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002
#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004
#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
/*@}*/
/*@} */

/*@}*//*Audio flags*/
/*@} *//*Audio flags */

/**
* This function is called when the audio device needs more data.
Expand Down Expand Up @@ -218,10 +218,10 @@ typedef struct SDL_AudioCVT
* These functions return the list of built in audio drivers, in the
* order that they are normally initialized by default.
*/
/*@{*/
/*@{ */
extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
/*@}*/
/*@} */

/**
* \name Initialization and cleanup
Expand All @@ -230,10 +230,10 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
* you have a specific need to specify the audio driver you want to
* use. You should normally use SDL_Init() or SDL_InitSubSystem().
*/
/*@{*/
/*@{ */
extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
/*@}*/
/*@} */

/**
* This function returns the name of the current audio driver, or NULL
Expand Down Expand Up @@ -359,7 +359,7 @@ extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
*
* Get the current audio state.
*/
/*@{*/
/*@{ */
typedef enum
{
SDL_AUDIO_STOPPED = 0,
Expand All @@ -370,7 +370,7 @@ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);

extern DECLSPEC SDL_AudioStatus SDLCALL
SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
/*@}*//*Audio State*/
/*@} *//*Audio State */

/**
* \name Pause audio functions
Expand All @@ -381,11 +381,11 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
* data for your callback function after opening the audio device.
* Silence will be written to the audio device during the pause.
*/
/*@{*/
/*@{ */
extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
int pause_on);
/*@}*//*Pause audio functions*/
/*@} *//*Pause audio functions */

/**
* This function loads a WAVE from the data source, automatically freeing
Expand Down Expand Up @@ -482,12 +482,12 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
* the callback function is not running. Do not call these from the callback
* function or you will cause deadlock.
*/
/*@{*/
/*@{ */
extern DECLSPEC void SDLCALL SDL_LockAudio(void);
extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
/*@}*//*Audio lock functions*/
/*@} *//*Audio lock functions */

/**
* This function shuts down audio processing and closes the audio device.
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_config_psp.h
Expand Up @@ -99,8 +99,8 @@
#define HAVE_SQRT 1
#define HAVE_SETJMP 1
#define HAVE_NANOSLEEP 1
/*#define HAVE_SYSCONF 1*/
/*#define HAVE_SIGACTION 1*/
/*#define HAVE_SYSCONF 1 */
/*#define HAVE_SIGACTION 1 */


/* PSP isn't that sophisticated */
Expand Down
8 changes: 4 additions & 4 deletions include/SDL_endian.h
Expand Up @@ -33,10 +33,10 @@
/**
* \name The two types of endianness
*/
/*@{*/
/*@{ */
#define SDL_LIL_ENDIAN 1234
#define SDL_BIG_ENDIAN 4321
/*@}*/
/*@} */

#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
#ifdef __linux__
Expand Down Expand Up @@ -206,7 +206,7 @@ SDL_SwapFloat(float x)
* \name Swap to native
* Byteswap item from the specified endianness to the native endianness.
*/
/*@{*/
/*@{ */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define SDL_SwapLE16(X) (X)
#define SDL_SwapLE32(X) (X)
Expand All @@ -226,7 +226,7 @@ SDL_SwapFloat(float x)
#define SDL_SwapBE64(X) (X)
#define SDL_SwapFloatBE(X) (X)
#endif
/*@}*//*Swap to native*/
/*@} *//*Swap to native */

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_error.h
Expand Up @@ -48,7 +48,7 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
* \internal
* Private error reporting function - used internally.
*/
/*@{*/
/*@{ */
#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM)
#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED)
#define SDL_InvalidParamError(param) SDL_SetError("Parameter '%s' is invalid", (param))
Expand All @@ -63,7 +63,7 @@ typedef enum
} SDL_errorcode;
/* SDL_Error() unconditionally returns -1. */
extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
/*@}*//*Internal error functions*/
/*@} *//*Internal error functions */

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
Expand Down
8 changes: 4 additions & 4 deletions include/SDL_events.h
Expand Up @@ -541,7 +541,7 @@ typedef union SDL_Event
*/
extern DECLSPEC void SDLCALL SDL_PumpEvents(void);

/*@{*/
/*@{ */
typedef enum
{
SDL_ADDEVENT,
Expand Down Expand Up @@ -570,7 +570,7 @@ typedef enum
extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
SDL_eventaction action,
Uint32 minType, Uint32 maxType);
/*@}*/
/*@} */

/**
* Checks to see if certain event types are in the event queue.
Expand Down Expand Up @@ -681,7 +681,7 @@ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
void *userdata);

/*@{*/
/*@{ */
#define SDL_QUERY -1
#define SDL_IGNORE 0
#define SDL_DISABLE 0
Expand All @@ -697,7 +697,7 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
* current processing state of the specified event.
*/
extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
/*@}*/
/*@} */
#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)

/**
Expand Down
14 changes: 7 additions & 7 deletions include/SDL_haptic.h
Expand Up @@ -140,12 +140,12 @@ typedef struct _SDL_Haptic SDL_Haptic;
*
* Different haptic features a device can have.
*/
/*@{*/
/*@{ */

/**
* \name Haptic effects
*/
/*@{*/
/*@{ */

/**
* \brief Constant effect supported.
Expand Down Expand Up @@ -177,7 +177,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
#define SDL_HAPTIC_LEFTRIGHT (1<<2)

/* !!! FIXME: put this back when we have more bits in 2.1 */
/*#define SDL_HAPTIC_SQUARE (1<<2)*/
/*#define SDL_HAPTIC_SQUARE (1<<2) */

/**
* \brief Triangle wave effect supported.
Expand Down Expand Up @@ -262,7 +262,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_CUSTOM (1<<11)

/*@}*//*Haptic effects*/
/*@} *//*Haptic effects */

/* These last few are features the device has, not effects */

Expand Down Expand Up @@ -305,7 +305,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
/**
* \name Direction encodings
*/
/*@{*/
/*@{ */

/**
* \brief Uses polar coordinates for the direction.
Expand All @@ -328,9 +328,9 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_SPHERICAL 2

/*@}*//*Direction encodings*/
/*@} *//*Direction encodings */

/*@}*//*Haptic features*/
/*@} *//*Haptic features */

/*
* Misc defines.
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_joystick.h
Expand Up @@ -187,7 +187,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
/**
* \name Hat positions
*/
/*@{*/
/*@{ */
#define SDL_HAT_CENTERED 0x00
#define SDL_HAT_UP 0x01
#define SDL_HAT_RIGHT 0x02
Expand All @@ -197,7 +197,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN)
#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP)
#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN)
/*@}*/
/*@} */

/**
* Get the current state of a POV hat on a joystick.
Expand Down

0 comments on commit 695344d

Please sign in to comment.