Removed 'device' from monitor callback.

include/GL/glfw3.h

@@ -497,7 +497,7 @@ typedef void (* GLFWcursorenterfun)(GLFWwindow,int);
 typedef void (* GLFWscrollfun)(GLFWwindow,double,double);
 typedef void (* GLFWkeyfun)(GLFWwindow,int,int);
 typedef void (* GLFWcharfun)(GLFWwindow,int);
-typedef void (* GLFWmonitordevicefun)(GLFWmonitor,int);
+typedef void (* GLFWmonitorfun)(GLFWmonitor,int);
 
 /* The video mode structure used by glfwGetVideoModes */
 typedef struct
@@ -534,7 +534,7 @@ GLFWAPI const char* glfwErrorString(int error);
 GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun);
 
 /* Monitor callback registration */
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun);
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun);
 
 /* Monitor attributes */
 GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);

src/internal.h

@@ -256,7 +256,7 @@ struct _GLFWlibrary
     GLFWscrollfun        scrollCallback;
     GLFWkeyfun           keyCallback;
     GLFWcharfun          charCallback;
-    GLFWmonitordevicefun monitorCallback;
+    GLFWmonitorfun       monitorCallback;
 
     GLFWgammaramp currentRamp;
     GLFWgammaramp originalRamp;

src/monitor.c

@@ -137,7 +137,7 @@ GLFWAPI const char* glfwGetMonitorString(GLFWmonitor handle, int param)
 // Set a callback function for monitor events
 //========================================================================
 
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun)
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
 {
     if (!_glfwInitialized)
     {

tests/events.c

@@ -394,7 +394,7 @@ int main(void)
     glfwSetScrollCallback(scroll_callback);
     glfwSetKeyCallback(key_callback);
     glfwSetCharCallback(char_callback);
-    glfwSetMonitorDeviceCallback(monitor_callback);
+    glfwSetMonitorCallback(monitor_callback);
 
     window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
     if (!window)