Prefix Allegro macros to avoid clashes with user code.

- prefix/namespace macros

Author: billyquith

addons/image/png.c

@@ -288,7 +288,7 @@ static ALLEGRO_BITMAP *really_load_png(png_structp png_ptr, png_infop info_ptr,
 
             case 24:
                for (i = 0; i < width; i++) {
-                  uint32_t pix = READ3BYTES(ptr);
+                  uint32_t pix = AL_READ3BYTES(ptr);
                   ptr += 3;
                   *(dest++) = pix & 0xff;
                   *(dest++) = (pix >> 8) & 0xff;

include/allegro5/internal/aintern_pixels.h

@@ -57,7 +57,7 @@
          }                                                                    \
                                                                               \
          case ALLEGRO_PIXEL_FORMAT_RGB_888: {                                 \
-            uint32_t _gp_pixel = READ3BYTES(data);                            \
+            uint32_t _gp_pixel = AL_READ3BYTES(data);                         \
             _AL_MAP_RGBA(color,                                               \
                (_gp_pixel & 0xFF0000) >> 16,                                  \
                (_gp_pixel & 0x00FF00) >>  8,                                  \
@@ -141,7 +141,7 @@
          }                                                                    \
                                                                               \
          case ALLEGRO_PIXEL_FORMAT_BGR_888: {                                 \
-            uint32_t _gp_pixel = READ3BYTES(data);                            \
+            uint32_t _gp_pixel = AL_READ3BYTES(data);                         \
             _AL_MAP_RGBA(color,                                               \
                (_gp_pixel & 0x000000FF) >>  0,                                \
                (_gp_pixel & 0x0000FF00) >>  8,                                \
@@ -306,7 +306,7 @@
             _pp_pixel  = _al_fast_float_to_int(color.r * 255) << 16;          \
             _pp_pixel |= _al_fast_float_to_int(color.g * 255) << 8;           \
             _pp_pixel |= _al_fast_float_to_int(color.b * 255);                \
-            WRITE3BYTES(data, _pp_pixel);                                     \
+            AL_WRITE3BYTES(data, _pp_pixel);                                  \
             if (advance)                                                      \
                data += 3;                                                     \
             break;                                                            \
@@ -373,7 +373,7 @@
             _pp_pixel  = _al_fast_float_to_int(color.b * 0xff) << 16;         \
             _pp_pixel |= _al_fast_float_to_int(color.g * 0xff) << 8;          \
             _pp_pixel |= _al_fast_float_to_int(color.r * 0xff);               \
-            WRITE3BYTES(data, _pp_pixel);                                     \
+            AL_WRITE3BYTES(data, _pp_pixel);                                  \
             if (advance)                                                      \
                data += 3;                                                     \
             break;                                                            \

include/allegro5/internal/alconfig.h

@@ -226,23 +226,23 @@
 /* endian-independent 3-byte accessor macros */
 #ifdef ALLEGRO_LITTLE_ENDIAN
 
-   #define READ3BYTES(p)  ((*(unsigned char *)(p))               \
-                           | (*((unsigned char *)(p) + 1) << 8)  \
-                           | (*((unsigned char *)(p) + 2) << 16))
+   #define AL_READ3BYTES(p)  ((*(unsigned char *)(p))               \
+                              | (*((unsigned char *)(p) + 1) << 8)  \
+                              | (*((unsigned char *)(p) + 2) << 16))
 
-   #define WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c)),             \
-                              (*((unsigned char *)(p) + 1) = (c) >> 8),  \
-                              (*((unsigned char *)(p) + 2) = (c) >> 16))
+   #define AL_WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c)),             \
+                                 (*((unsigned char *)(p) + 1) = (c) >> 8),  \
+                                 (*((unsigned char *)(p) + 2) = (c) >> 16))
 
 #elif defined ALLEGRO_BIG_ENDIAN
 
-   #define READ3BYTES(p)  ((*(unsigned char *)(p) << 16)         \
-                           | (*((unsigned char *)(p) + 1) << 8)  \
-                           | (*((unsigned char *)(p) + 2)))
+   #define AL_READ3BYTES(p)  ((*(unsigned char *)(p) << 16)         \
+                              | (*((unsigned char *)(p) + 1) << 8)  \
+                              | (*((unsigned char *)(p) + 2)))
 
-   #define WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c) >> 16),       \
-                              (*((unsigned char *)(p) + 1) = (c) >> 8),  \
-                              (*((unsigned char *)(p) + 2) = (c)))
+   #define AL_WRITE3BYTES(p,c)  ((*(unsigned char *)(p) = (c) >> 16),       \
+                                 (*((unsigned char *)(p) + 1) = (c) >> 8),  \
+                                 (*((unsigned char *)(p) + 2) = (c)))
 
 #else
    #error endianess not defined

src/memdraw.c

@@ -96,7 +96,7 @@ void _al_clear_bitmap_by_locking(ALLEGRO_BITMAP *bitmap, ALLEGRO_COLOR *color)
       }
 
       case 3: {
-         int pixel_value = READ3BYTES(line_ptr);
+         int pixel_value = AL_READ3BYTES(line_ptr);
          for (y = y1; y < y1 + h; y++) {
             unsigned char *data = (unsigned char *)line_ptr;
             if (pixel_value == 0) {    /* fast path */