# HG changeset patch
# User diego
# Date 1308504791 0
# Node ID d9a4365d1006e905950b6cb60a90c5fdbc556388
# Parent  7b168fb5ee985d284f7e8f5519d6690c10cb770e
gui: Rename TRANSPARENT #define to MP_TRANSPARENT.

TRANSPARENT is defined in windows.h and clashes for the Win32 GUI.

diff -r 7b168fb5ee98 -r d9a4365d1006 gui/skin/font.c
--- a/gui/skin/font.c	Sun Jun 19 17:33:06 2011 +0000
+++ b/gui/skin/font.c	Sun Jun 19 17:33:11 2011 +0000
@@ -312,7 +312,7 @@
     ibuf = (uint32_t *)Fonts[id]->Bitmap.Image;
 
     for (i = 0; i < item->Bitmap.ImageSize / 4; i++)
-        obuf[i] = TRANSPARENT;
+        obuf[i] = MP_TRANSPARENT;
 
     if (tw <= iw) {
         switch (item->align) {
diff -r 7b168fb5ee98 -r d9a4365d1006 gui/util/bitmap.h
--- a/gui/util/bitmap.h	Sun Jun 19 17:33:06 2011 +0000
+++ b/gui/util/bitmap.h	Sun Jun 19 17:33:11 2011 +0000
@@ -19,11 +19,11 @@
 #ifndef MPLAYER_GUI_BITMAP_H
 #define MPLAYER_GUI_BITMAP_H
 
-#define TRANSPARENT  0xffff00ff   // transparent color (opaque fuchsia/magenta)
-#define ALPHA_OPAQUE 0xff000000
+#define MP_TRANSPARENT 0xffff00ff // transparent color (opaque fuchsia/magenta)
+#define ALPHA_OPAQUE   0xff000000
 
 // for legacy reasons, we must treat all kind of fuchsia/magenta as transparent
-#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == TRANSPARENT)
+#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == MP_TRANSPARENT)
 
 typedef struct {
     unsigned long Width;