From 4e0dc2bed9493b2ae8b380e757da3a07757c3f78 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Wed, 28 May 2014 05:17:14 +0200
Subject: namespace some definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 configure | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index dcb613d..87c0786 100755
--- a/configure
+++ b/configure
@@ -103,55 +103,55 @@ if [ ${enable_debug} = 1 ]; then
 fi
 if [ ${enable_dummy} = 1 ]; then
     echo 'LIBOBJ += gamma-dummy' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_DUMMY' >&3
-    echo '#define HAVE_GAMMA_METHOD_DUMMY' >&4
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_DUMMY' >&3
+    echo '#define HAVE_LIBGAMMA_METHOD_DUMMY' >&4
     have_dummy='Yes'
 fi
 if [ ${enable_randr} = 1 ]; then
     echo 'LIBOBJ += gamma-x-randr' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_X_RANDR' >&3
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_X_RANDR' >&3
     echo 'LIBS_LD += $$(pkg-config --libs xcb xcb-randr)' >&3
     echo 'LIBS_C += $$(pkg-config --cflags xcb xcb-randr)' >&3
-    echo '#define HAVE_GAMMA_METHOD_X_RANDR' >&4
+    echo '#define HAVE_LIBGAMMA_METHOD_X_RANDR' >&4
     have_randr='Yes'
 fi
 if [ ${enable_vidmode} = 1 ]; then
     echo 'LIBOBJ += gamma-x-vidmode' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_X_VIDMODE' >&3
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_X_VIDMODE' >&3
     echo 'LIBS_LD += $$(pkg-config --libs x11 xxf86vm)' >&3
     echo 'LIBS_C += $$(pkg-config --cflags x11 xxf86vm)' >&3
-    echo '#define HAVE_GAMMA_METHOD_X_VIDMODE' >&4
+    echo '#define HAVE_LIBGAMMA_METHOD_X_VIDMODE' >&4
     have_vidmode='Yes'
 fi
 if [ ${enable_drm} = 1 ]; then
     echo 'LIBOBJ += gamma-linux-drm' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_LINUX_DRM' >&3
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_LINUX_DRM' >&3
     echo 'LIBS_LD += $$(pkg-config --libs libdrm)' >&3
     echo 'LIBS_C += $$(pkg-config --cflags libdrm)' >&3
-    echo '#define HAVE_GAMMA_METHOD_LINUX_DRM' >&4
+    echo '#define HAVE_LIBGAMMA_METHOD_LINUX_DRM' >&4
     have_drm='Yes'
 fi
 if [ ${enable_w32gdi} = 1 ]; then
     echo 'LIBOBJ += gamma-w32-gdi' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_W32_GDI' >&3
-    echo '#define HAVE_GAMMA_METHOD_W32_GDI' >&4
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_W32_GDI' >&3
+    echo '#define HAVE_LIBGAMMA_METHOD_W32_GDI' >&4
     have_w32gdi='Yes'
 fi
 if [ ${enable_quartz} = 1 ]; then
     echo 'LIBOBJ += gamma-quartz-cg' >&3
-    echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
+    echo 'DEFINITIONS += -DHAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
     if [ ${fake_w32gdi} = 0 ]; then
 	F_ApplicationServices="/System/Library/Frameworks/ApplicationServices.framework"
 	I_ApplicationServices="${F_ApplicationServices}/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers"
 	echo "LIBS_LD += -I${I_ApplicationServices} -F${F_ApplicationServices} -framework ApplicationServices" >&3
     fi
-    echo '#define HAVE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
+    echo '#define HAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
     have_quartz='Yes'
 fi
 if [ ${fake_w32gdi} = 1 ]; then
     echo 'LIBOBJ += fake-w32-gdi' >&3
-    echo 'DEFINITIONS += -DFAKE_GAMMA_METHOD_W32_GDI' >&3
-    echo '#define FAKE_GAMMA_METHOD_W32_GDI' >&4
+    echo 'DEFINITIONS += -DFAKE_LIBGAMMA_METHOD_W32_GDI' >&3
+    echo '#define FAKE_LIBGAMMA_METHOD_W32_GDI' >&4
     if [ ${enable_randr} = 1 ]; then
 	have_w32gdi='Yes, fake via the RandR protocol for X'
     else
@@ -160,8 +160,8 @@ if [ ${fake_w32gdi} = 1 ]; then
 fi
 if [ ${fake_quartz} = 1 ]; then
     echo 'LIBOBJ += fake-quartz-cg' >&3
-    echo 'DEFINITIONS += -DFAKE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
-    echo '#define FAKE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
+    echo 'DEFINITIONS += -DFAKE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
+    echo '#define FAKE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
     if [ ${enable_randr} = 1 ]; then
 	have_quartz='Yes, fake via the RandR protocol for X'
     else
-- 
cgit v1.2.3-70-g09d2