From ac5fee4d20557078562f08327dc779321d20dd6d Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Thu, 17 Jan 2013 21:56:02 +0100
Subject: [PATCH] Re-used POSITION_* tokens for monitor position.

---
 include/GL/glfw3.h | 4 ++--
 src/monitor.c      | 4 ++--
 tests/events.c     | 4 ++--
 tests/modes.c      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 2f21e5f2..d26dec10 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -541,8 +541,8 @@ extern "C" {
 
 #define GLFW_MONITOR_WIDTH_MM       0x00060001
 #define GLFW_MONITOR_HEIGHT_MM      0x00060002
-#define GLFW_MONITOR_POS_X          0x00060003
-#define GLFW_MONITOR_POS_Y          0x00060004
+/* reuse GLFW_POSITION_X */
+/* reuse GLFW_POSITION_Y */
 
 #define GLFW_CONNECTED              0x00061000
 #define GLFW_DISCONNECTED           0x00061001
diff --git a/src/monitor.c b/src/monitor.c
index be52b1e7..107622bf 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -323,9 +323,9 @@ GLFWAPI int glfwGetMonitorParam(GLFWmonitor* handle, int param)
             return monitor->widthMM;
         case GLFW_MONITOR_HEIGHT_MM:
             return monitor->heightMM;
-        case GLFW_MONITOR_POS_X:
+        case GLFW_POSITION_X:
             return monitor->positionX;
-        case GLFW_MONITOR_POS_Y:
+        case GLFW_POSITION_Y:
             return monitor->positionY;
     }
 
diff --git a/tests/events.c b/tests/events.c
index 596eab0f..0bea0064 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -351,8 +351,8 @@ void monitor_callback(GLFWmonitor* monitor, int event)
                glfwGetTime(),
                glfwGetMonitorName(monitor),
                mode.width, mode.height,
-               glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_X),
-               glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_Y),
+               glfwGetMonitorParam(monitor, GLFW_POSITION_X),
+               glfwGetMonitorParam(monitor, GLFW_POSITION_Y),
                glfwGetMonitorParam(monitor, GLFW_MONITOR_WIDTH_MM),
                glfwGetMonitorParam(monitor, GLFW_MONITOR_HEIGHT_MM));
     }
diff --git a/tests/modes.c b/tests/modes.c
index d2b8d08e..64c63b0e 100644
--- a/tests/modes.c
+++ b/tests/modes.c
@@ -101,8 +101,8 @@ static void list_modes(GLFWmonitor* monitor)
            glfwGetPrimaryMonitor() == monitor ? "primary" : "secondary");
     printf("Current mode: %s\n", format_mode(&mode));
     printf("Virtual position: %i %i\n",
-           glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_X),
-           glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_Y));
+           glfwGetMonitorParam(monitor, GLFW_POSITION_X),
+           glfwGetMonitorParam(monitor, GLFW_POSITION_Y));
 
     widthMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_WIDTH_MM);
     heightMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_HEIGHT_MM);