fix namespace collision

Author: orsinium

src/firefly.c

@@ -70,21 +70,21 @@ DPad4 pad_to_dpad4(Pad self)
     }
     if (y > 300 && y > absX)
     {
-        return UP;
+        return DPAD4_UP;
     }
     if (y < -300 && -y > absX)
     {
-        return DOWN;
+        return DPAD4_DOWN;
     }
     if (x > 300 && x > absY)
     {
-        return RIGHT;
+        return DPAD4_RIGHT;
     }
     if (x < -300 && -x > absY)
     {
-        return LEFT;
+        return DPAD4_LEFT;
     }
-    return NONE;
+    return DPAD4_NONE;
 }
 
 // -- GRAPHICS -- //
@@ -365,6 +365,11 @@ Buffer get_name(Peer p, Buffer buf)
     return name;
 }
 
+Color _parseColor(uint32_t c)
+{
+    return (Color)(c & 0xf + 1);
+}
+
 /// @brief Get system settings.
 Settings get_settings(Peer p)
 {
@@ -390,11 +395,6 @@ Settings get_settings(Peer p)
     return settings;
 }
 
-Color _parseColor(uint32_t c)
-{
-    return (Color)(c & 0xf + 1);
-}
-
 /// @brief Ask the runtime to restart the app after the current update iteration.
 void restart()
 {

src/firefly.h

@@ -216,11 +216,11 @@ typedef struct DPad8 DPad8;
 
 enum DPad4
 {
-    NONE = 0,
-    LEFT = 1,
-    RIGHT = 2,
-    UP = 3,
-    DOWN = 4,
+    DPAD4_NONE = 0,
+    DPAD4_LEFT = 1,
+    DPAD4_RIGHT = 2,
+    DPAD4_UP = 3,
+    DPAD4_DOWN = 4,
 };
 typedef enum DPad4 DPad4;