We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Add u to defines

uDiff.diff (text/plain), 6.64 KB, created by C.W. Betts on 2016-02-02 01:59:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: C.W. Betts

Created: 2016-02-02 01:59:11 UTC

Size: 6.64 KB

patch

obsolete

>diff -r 698a7d8626b9 include/SDL.h
>--- a/include/SDL.h	Sun Jan 31 21:11:15 2016 -0800
>+++ b/include/SDL.h	Mon Feb 01 18:52:38 2016 -0700
>@@ -72,14 +72,14 @@
>  *  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 */
>-#define SDL_INIT_JOYSTICK       0x00000200  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
>-#define SDL_INIT_HAPTIC         0x00001000
>-#define SDL_INIT_GAMECONTROLLER 0x00002000  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
>-#define SDL_INIT_EVENTS         0x00004000
>-#define SDL_INIT_NOPARACHUTE    0x00100000  /**< compatibility; this flag is ignored. */
>+#define SDL_INIT_TIMER          0x00000001u
>+#define SDL_INIT_AUDIO          0x00000010u
>+#define SDL_INIT_VIDEO          0x00000020u  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
>+#define SDL_INIT_JOYSTICK       0x00000200u  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
>+#define SDL_INIT_HAPTIC         0x00001000u
>+#define SDL_INIT_GAMECONTROLLER 0x00002000u  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
>+#define SDL_INIT_EVENTS         0x00004000u
>+#define SDL_INIT_NOPARACHUTE    0x00100000u  /**< compatibility; this flag is ignored. */
> #define SDL_INIT_EVERYTHING ( \
>                 SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
>                 SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
>diff -r 698a7d8626b9 include/SDL_haptic.h
>--- a/include/SDL_haptic.h	Sun Jan 31 21:11:15 2016 -0800
>+++ b/include/SDL_haptic.h	Mon Feb 01 18:52:38 2016 -0700
>@@ -149,7 +149,7 @@
>  *
>  *  \sa SDL_HapticCondition
>  */
>-#define SDL_HAPTIC_CONSTANT   (1<<0)
>+#define SDL_HAPTIC_CONSTANT   (1u<<0)
> 
> /**
>  *  \brief Sine wave effect supported.
>@@ -158,7 +158,7 @@
>  *
>  *  \sa SDL_HapticPeriodic
>  */
>-#define SDL_HAPTIC_SINE       (1<<1)
>+#define SDL_HAPTIC_SINE       (1u<<1)
> 
> /**
>  *  \brief Left/Right effect supported.
>@@ -169,7 +169,7 @@
>  * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
>  *          we ran out of bits, and this is important for XInput devices.
>  */
>-#define SDL_HAPTIC_LEFTRIGHT     (1<<2)
>+#define SDL_HAPTIC_LEFTRIGHT     (1u<<2)
> 
> /* !!! FIXME: put this back when we have more bits in 2.1 */
> /* #define SDL_HAPTIC_SQUARE     (1<<2) */
>@@ -181,7 +181,7 @@
>  *
>  *  \sa SDL_HapticPeriodic
>  */
>-#define SDL_HAPTIC_TRIANGLE   (1<<3)
>+#define SDL_HAPTIC_TRIANGLE   (1u<<3)
> 
> /**
>  *  \brief Sawtoothup wave effect supported.
>@@ -190,7 +190,7 @@
>  *
>  *  \sa SDL_HapticPeriodic
>  */
>-#define SDL_HAPTIC_SAWTOOTHUP (1<<4)
>+#define SDL_HAPTIC_SAWTOOTHUP (1u<<4)
> 
> /**
>  *  \brief Sawtoothdown wave effect supported.
>@@ -199,7 +199,7 @@
>  *
>  *  \sa SDL_HapticPeriodic
>  */
>-#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
>+#define SDL_HAPTIC_SAWTOOTHDOWN (1u<<5)
> 
> /**
>  *  \brief Ramp effect supported.
>@@ -208,7 +208,7 @@
>  *
>  *  \sa SDL_HapticRamp
>  */
>-#define SDL_HAPTIC_RAMP       (1<<6)
>+#define SDL_HAPTIC_RAMP       (1u<<6)
> 
> /**
>  *  \brief Spring effect supported - uses axes position.
>@@ -218,7 +218,7 @@
>  *
>  *  \sa SDL_HapticCondition
>  */
>-#define SDL_HAPTIC_SPRING     (1<<7)
>+#define SDL_HAPTIC_SPRING     (1u<<7)
> 
> /**
>  *  \brief Damper effect supported - uses axes velocity.
>@@ -228,7 +228,7 @@
>  *
>  *  \sa SDL_HapticCondition
>  */
>-#define SDL_HAPTIC_DAMPER     (1<<8)
>+#define SDL_HAPTIC_DAMPER     (1u<<8)
> 
> /**
>  *  \brief Inertia effect supported - uses axes acceleration.
>@@ -238,7 +238,7 @@
>  *
>  *  \sa SDL_HapticCondition
>  */
>-#define SDL_HAPTIC_INERTIA    (1<<9)
>+#define SDL_HAPTIC_INERTIA    (1u<<9)
> 
> /**
>  *  \brief Friction effect supported - uses axes movement.
>@@ -248,14 +248,14 @@
>  *
>  *  \sa SDL_HapticCondition
>  */
>-#define SDL_HAPTIC_FRICTION   (1<<10)
>+#define SDL_HAPTIC_FRICTION   (1u<<10)
> 
> /**
>  *  \brief Custom effect is supported.
>  *
>  *  User defined custom haptic effect.
>  */
>-#define SDL_HAPTIC_CUSTOM     (1<<11)
>+#define SDL_HAPTIC_CUSTOM     (1u<<11)
> 
> /* @} *//* Haptic effects */
> 
>@@ -268,7 +268,7 @@
>  *
>  *  \sa SDL_HapticSetGain
>  */
>-#define SDL_HAPTIC_GAIN       (1<<12)
>+#define SDL_HAPTIC_GAIN       (1u<<12)
> 
> /**
>  *  \brief Device can set autocenter.
>@@ -277,7 +277,7 @@
>  *
>  *  \sa SDL_HapticSetAutocenter
>  */
>-#define SDL_HAPTIC_AUTOCENTER (1<<13)
>+#define SDL_HAPTIC_AUTOCENTER (1u<<13)
> 
> /**
>  *  \brief Device can be queried for effect status.
>@@ -286,7 +286,7 @@
>  *
>  *  \sa SDL_HapticGetEffectStatus
>  */
>-#define SDL_HAPTIC_STATUS     (1<<14)
>+#define SDL_HAPTIC_STATUS     (1u<<14)
> 
> /**
>  *  \brief Device can be paused.
>@@ -294,7 +294,7 @@
>  *  \sa SDL_HapticPause
>  *  \sa SDL_HapticUnpause
>  */
>-#define SDL_HAPTIC_PAUSE      (1<<15)
>+#define SDL_HAPTIC_PAUSE      (1u<<15)
> 
> 
> /**
>diff -r 698a7d8626b9 include/SDL_rwops.h
>--- a/include/SDL_rwops.h	Sun Jan 31 21:11:15 2016 -0800
>+++ b/include/SDL_rwops.h	Mon Feb 01 18:52:38 2016 -0700
>@@ -39,12 +39,12 @@
> #endif
> 
> /* RWops Types */
>-#define SDL_RWOPS_UNKNOWN   0   /* Unknown stream type */
>-#define SDL_RWOPS_WINFILE   1   /* Win32 file */
>-#define SDL_RWOPS_STDFILE   2   /* Stdio file */
>-#define SDL_RWOPS_JNIFILE   3   /* Android asset */
>-#define SDL_RWOPS_MEMORY    4   /* Memory stream */
>-#define SDL_RWOPS_MEMORY_RO 5   /* Read-Only memory stream */
>+#define SDL_RWOPS_UNKNOWN   0U  /* Unknown stream type */
>+#define SDL_RWOPS_WINFILE   1U  /* Win32 file */
>+#define SDL_RWOPS_STDFILE   2U  /* Stdio file */
>+#define SDL_RWOPS_JNIFILE   3U  /* Android asset */
>+#define SDL_RWOPS_MEMORY    4U  /* Memory stream */
>+#define SDL_RWOPS_MEMORY_RO 5U  /* Read-Only memory stream */
> 
> /**
>  * This is the read/write operation structure -- very basic.
>diff -r 698a7d8626b9 include/SDL_video.h
>--- a/include/SDL_video.h	Sun Jan 31 21:11:15 2016 -0800
>+++ b/include/SDL_video.h	Mon Feb 01 18:52:38 2016 -0700
>@@ -121,7 +121,7 @@
> /**
>  *  \brief Used to indicate that you don't care what the window position is.
>  */
>-#define SDL_WINDOWPOS_UNDEFINED_MASK    0x1FFF0000
>+#define SDL_WINDOWPOS_UNDEFINED_MASK    0x1FFF0000u
> #define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X)  (SDL_WINDOWPOS_UNDEFINED_MASK|(X))
> #define SDL_WINDOWPOS_UNDEFINED         SDL_WINDOWPOS_UNDEFINED_DISPLAY(0)
> #define SDL_WINDOWPOS_ISUNDEFINED(X)    \
>@@ -130,7 +130,7 @@
> /**
>  *  \brief Used to indicate that the window position should be centered.
>  */
>-#define SDL_WINDOWPOS_CENTERED_MASK    0x2FFF0000
>+#define SDL_WINDOWPOS_CENTERED_MASK    0x2FFF0000u
> #define SDL_WINDOWPOS_CENTERED_DISPLAY(X)  (SDL_WINDOWPOS_CENTERED_MASK|(X))
> #define SDL_WINDOWPOS_CENTERED         SDL_WINDOWPOS_CENTERED_DISPLAY(0)
> #define SDL_WINDOWPOS_ISCENTERED(X)    \

Actions: View | Diff

Attachments on bug 3165: 2372

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.