Ticket #346: builtin.diff

builtin.h

@@ -7 +7 @@
 #define _I386_BUILTIN_H
 
 #include <sys/cdefs.h>
-#include <stdint.h>
 
 __BEGIN_DECLS
 
@@ -61 +60 @@
  * @param   pu16    Pointer to the value to update.
  * @param   u16     The new value.
  */
-static inline uint16_t __atomic_xchg_word(volatile uint16_t *pu16, uint16_t u16)
+static inline __uint16_t __atomic_xchg_word(volatile __uint16_t *pu16, __uint16_t u16)
 {
     __asm__ __volatile__ ("xchgw %0, %1" : "=m" (*pu16), "=r" (u16) : "1" (u16));
     return u16;
@@ -165 +164 @@
  * @returns The new value.
  * @param   pu32    Pointer to the value to increment.
  */
-static __inline__ uint32_t __atomic_increment_u32(uint32_t __volatile__ *pu32)
+static __inline__ __uint32_t __atomic_increment_u32(__uint32_t __volatile__ *pu32)
 {
-    uint32_t u32;
+    __uint32_t u32;
     __asm__ __volatile__("lock; xadd %0, %1\n\t"
                          "incl %0\n\t"
                          : "=r" (u32),
@@ -183 +182 @@
  * @returns The new value.
  * @param   pi32    Pointer to the value to increment.
  */
-static __inline__ int32_t __atomic_increment_s32(int32_t __volatile__ *pi32)
+static __inline__ __int32_t __atomic_increment_s32(__int32_t __volatile__ *pi32)
 {
-    int32_t i32;
+    __int32_t i32;
     __asm__ __volatile__("lock; xadd %0, %1\n\t"
                          "incl %0\n\t"
                          : "=r" (i32),
@@ -200 +199 @@
  *
  * @param   pu16    Pointer to the value to increment.
  */
-static __inline__ void __atomic_increment_u16(uint16_t __volatile__ *pu16)
+static __inline__ void __atomic_increment_u16(__uint16_t __volatile__ *pu16)
 {
     __asm__ __volatile__("lock; incw %0"
                          : "=m" (*pu16)
@@ -225 +224 @@
  * @returns The new value.
  * @param   pu32      Pointer to the value to decrement.
  */
-static __inline__ uint32_t __atomic_decrement_u32(__volatile__ uint32_t *pu32)
+static __inline__ __uint32_t __atomic_decrement_u32(__volatile__ __uint32_t *pu32)
 {
-    uint32_t u32;
+    __uint32_t u32;
     __asm__ __volatile__("lock; xadd %0, %1\n\t"
                          "decl %0\n\t"
                          : "=r" (u32),
@@ -243 +242 @@
  * @returns The new value.
  * @param   pi32    Pointer to the value to decrement.
  */
-static __inline__ int32_t __atomic_decrement_s32(__volatile__ int32_t *pi32)
+static __inline__ __int32_t __atomic_decrement_s32(__volatile__ __int32_t *pi32)
 {
-    int32_t i32;
+    __int32_t i32;
     __asm__ __volatile__("lock; xadd %0, %1\n\t"
                          "decl %0\n\t"
                          : "=r" (i32),
@@ -261 +260 @@
  * @returns The new value.
  * @param   pu16    Pointer to the value to decrement.
  */
-static __inline__ void __atomic_decrement_u16(uint16_t __volatile__ *pu16)
+static __inline__ void __atomic_decrement_u16(__uint16_t __volatile__ *pu16)
 {
     __asm__ __volatile__("lock; decw %0"
                          : "=m" (*pu16)
@@ -311 +310 @@
  * @param   pu16    Pointer to the value to increment.
  * @param   u16Max  *pu16 must not be above this value after the incrementation.
  */
-static inline unsigned __atomic_increment_word_max(volatile uint16_t *pu16, const uint16_t u16Max)
+static inline unsigned __atomic_increment_word_max(volatile __uint16_t *pu16, const __uint16_t u16Max)
 {
     unsigned rc = 0;
     __asm__ __volatile__("movw  %2, %%ax\n\t"
@@ -380 +379 @@
  * @param   pu16    Pointer to the  value to decrement.
  * @param   u16Min  *pu16 must not be below this value after the decrementation.
  */
-static inline unsigned __atomic_decrement_word_min(volatile uint16_t *pu16, const uint16_t u16Min)
+static inline unsigned __atomic_decrement_word_min(volatile __uint16_t *pu16, const __uint16_t u16Min)
 {
     unsigned rc = 0;
     __asm__ __volatile__("movw  %2, %%ax\n\t"
@@ -414 +413 @@
  * @param   u32New  The new value.
  * @param   u32Cur  The current value. Only update if *pu32 equals this one.
  */
-static inline unsigned __atomic_cmpxchg32(volatile uint32_t *pu32, uint32_t u32New, uint32_t u32Old)
+static inline unsigned __atomic_cmpxchg32(volatile __uint32_t *pu32, __uint32_t u32New, __uint32_t u32Old)
 {
     __asm__ __volatile__("lock; cmpxchgl %2, %1\n\t"
                          "setz  %%al\n\t"