diff -Naurp gpu-viv-bin-mx6q-12.09.01-orig/usr/include/EGL/eglvivante.h gpu-viv-bin-mx6q-12.09.01/usr/include/EGL/eglvivante.h
--- gpu-viv-bin-mx6q-12.09.01-orig/usr/include/EGL/eglvivante.h	2012-12-11 10:47:45.368246727 -0500
+++ gpu-viv-bin-mx6q-12.09.01/usr/include/EGL/eglvivante.h	2012-12-11 10:49:18.472249861 -0500
@@ -33,7 +33,7 @@ typedef HDC             EGLNativeDisplay
 typedef HWND            EGLNativeWindowType;
 typedef HBITMAP         EGLNativePixmapType;
 
-#elif defined(LINUX) && defined(EGL_API_FB) && !defined(__APPLE__)
+#elif defined(__linux__) && defined(EGL_API_FB) && !defined(__APPLE__)
 
 #if defined(WL_EGL_PLATFORM)
 /* Wayland types for client apps. */
@@ -137,7 +137,7 @@ struct egl_native_pixmap_t;
     typedef void*                               EGLNativeDisplayType;
 #endif
 
-#elif defined(LINUX) || defined(__APPLE__)
+#elif defined(__linux__) || defined(__APPLE__)
 /* X11 platform. */
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff -Naurp gpu-viv-bin-mx6q-12.09.01-orig/usr/include/HAL/gc_hal_eglplatform.h gpu-viv-bin-mx6q-12.09.01/usr/include/HAL/gc_hal_eglplatform.h
--- gpu-viv-bin-mx6q-12.09.01-orig/usr/include/HAL/gc_hal_eglplatform.h	2012-12-11 10:47:45.460246730 -0500
+++ gpu-viv-bin-mx6q-12.09.01/usr/include/HAL/gc_hal_eglplatform.h	2012-12-11 10:54:01.244259378 -0500
@@ -242,7 +242,7 @@ typedef struct __BITFIELDINFO{
     RGBQUAD       bmiColors[2];
 } BITFIELDINFO;
 
-#elif defined(LINUX) && defined(EGL_API_FB) && !defined(__APPLE__)
+#elif defined(__linux__) && defined(EGL_API_FB) && !defined(__APPLE__)
 
 #if defined(EGL_API_WL)
 /* Wayland platform. */
@@ -324,7 +324,7 @@ struct egl_native_pixmap_t;
     typedef void*                               HALNativeDisplayType;
 #endif
 
-#elif defined(LINUX) || defined(__APPLE__)
+#elif defined(__linux__) || defined(__APPLE__)
 /* X11 platform. */
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff -Naurp gpu-viv-bin-mx6q-12.09.01-orig/usr/include/HAL/gc_hal_vg.h gpu-viv-bin-mx6q-12.09.01/usr/include/HAL/gc_hal_vg.h
--- gpu-viv-bin-mx6q-12.09.01-orig/usr/include/HAL/gc_hal_vg.h	2012-12-11 10:47:45.476246731 -0500
+++ gpu-viv-bin-mx6q-12.09.01/usr/include/HAL/gc_hal_vg.h	2012-12-11 10:54:19.620259996 -0500
@@ -30,7 +30,7 @@ extern "C" {
 #if gcdENABLE_VG
 
 /* Thread routine type. */
-#if defined(LINUX)
+#if defined(__linux__)
     typedef gctINT              gctTHREADFUNCRESULT;
     typedef gctPOINTER          gctTHREADFUNCPARAMETER;
 #   define  gctTHREADFUNCTYPE