From 260dbf0a1d224ebb4de49e51a045ebb8b81d2a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@glfw.org>
Date: Sun, 29 Jan 2017 18:03:51 +0100
Subject: [PATCH] Win32: Cleanup

---
 src/win32_init.c     |  8 ++++----
 src/win32_joystick.c | 14 +++++++-------
 src/win32_platform.h | 16 ++++++++--------
 src/win32_time.c     |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/win32_init.c b/src/win32_init.c
index 966433a2..c9978c24 100644
--- a/src/win32_init.c
+++ b/src/win32_init.c
@@ -71,7 +71,7 @@ static GLFWbool loadLibraries(void)
         return GLFW_FALSE;
     }
 
-    _glfw.win32.winmm.timeGetTime = (PFN_timeGetTime)
+    _glfw.win32.winmm.GetTime = (PFN_timeGetTime)
         GetProcAddress(_glfw.win32.winmm.instance, "timeGetTime");
 
     _glfw.win32.user32.instance = LoadLibraryA("user32.dll");
@@ -89,7 +89,7 @@ static GLFWbool loadLibraries(void)
     _glfw.win32.dinput8.instance = LoadLibraryA("dinput8.dll");
     if (_glfw.win32.dinput8.instance)
     {
-        _glfw.win32.dinput8.DirectInput8Create = (PFN_DirectInput8Create)
+        _glfw.win32.dinput8.Create = (PFN_DirectInput8Create)
             GetProcAddress(_glfw.win32.dinput8.instance, "DirectInput8Create");
     }
 
@@ -110,9 +110,9 @@ static GLFWbool loadLibraries(void)
             _glfw.win32.xinput.instance = LoadLibraryA(names[i]);
             if (_glfw.win32.xinput.instance)
             {
-                _glfw.win32.xinput.XInputGetCapabilities = (PFN_XInputGetCapabilities)
+                _glfw.win32.xinput.GetCapabilities = (PFN_XInputGetCapabilities)
                     GetProcAddress(_glfw.win32.xinput.instance, "XInputGetCapabilities");
-                _glfw.win32.xinput.XInputGetState = (PFN_XInputGetState)
+                _glfw.win32.xinput.GetState = (PFN_XInputGetState)
                     GetProcAddress(_glfw.win32.xinput.instance, "XInputGetState");
 
                 break;
diff --git a/src/win32_joystick.c b/src/win32_joystick.c
index 40916917..9e536e56 100644
--- a/src/win32_joystick.c
+++ b/src/win32_joystick.c
@@ -470,7 +470,7 @@ static GLFWbool openXinputDevice(DWORD index)
     if (jid > GLFW_JOYSTICK_LAST)
         return GLFW_FALSE;
 
-    if (_glfw_XInputGetCapabilities(index, 0, &xic) != ERROR_SUCCESS)
+    if (XInputGetCapabilities(index, 0, &xic) != ERROR_SUCCESS)
         return GLFW_FALSE;
 
     js = _glfw.win32_js + jid;
@@ -591,7 +591,7 @@ static GLFWbool pollJoystickState(_GLFWjoystickWin32* js, int mode)
             XINPUT_GAMEPAD_DPAD_LEFT
         };
 
-        result = _glfw_XInputGetState(js->index, &xis);
+        result = XInputGetState(js->index, &xis);
         if (result != ERROR_SUCCESS)
         {
             if (result == ERROR_DEVICE_NOT_CONNECTED)
@@ -659,11 +659,11 @@ void _glfwInitJoysticksWin32(void)
 {
     if (_glfw.win32.dinput8.instance)
     {
-        if (FAILED(_glfw_DirectInput8Create(GetModuleHandle(NULL),
-                                            DIRECTINPUT_VERSION,
-                                            &IID_IDirectInput8W,
-                                            (void**) &_glfw.win32.dinput8.api,
-                                            NULL)))
+        if (FAILED(DirectInput8Create(GetModuleHandle(NULL),
+                                      DIRECTINPUT_VERSION,
+                                      &IID_IDirectInput8W,
+                                      (void**) &_glfw.win32.dinput8.api,
+                                      NULL)))
         {
             _glfwInputError(GLFW_PLATFORM_ERROR,
                             "Win32: Failed to create interface");
diff --git a/src/win32_platform.h b/src/win32_platform.h
index 52291d5f..d072d227 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -162,17 +162,17 @@ typedef enum PROCESS_DPI_AWARENESS
 
 // winmm.dll function pointer typedefs
 typedef DWORD (WINAPI * PFN_timeGetTime)(void);
-#define _glfw_timeGetTime _glfw.win32.winmm.timeGetTime
+#define timeGetTime _glfw.win32.winmm.GetTime
 
 // xinput.dll function pointer typedefs
 typedef DWORD (WINAPI * PFN_XInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*);
 typedef DWORD (WINAPI * PFN_XInputGetState)(DWORD,XINPUT_STATE*);
-#define _glfw_XInputGetCapabilities _glfw.win32.xinput.XInputGetCapabilities
-#define _glfw_XInputGetState _glfw.win32.xinput.XInputGetState
+#define XInputGetCapabilities _glfw.win32.xinput.GetCapabilities
+#define XInputGetState _glfw.win32.xinput.GetState
 
 // dinput8.dll function pointer typedefs
 typedef HRESULT (WINAPI * PFN_DirectInput8Create)(HINSTANCE,DWORD,REFIID,LPVOID*,LPUNKNOWN);
-#define _glfw_DirectInput8Create _glfw.win32.dinput8.DirectInput8Create
+#define DirectInput8Create _glfw.win32.dinput8.Create
 
 // user32.dll function pointer typedefs
 typedef BOOL (WINAPI * PFN_SetProcessDPIAware)(void);
@@ -259,19 +259,19 @@ typedef struct _GLFWlibraryWin32
 
     struct {
         HINSTANCE                       instance;
-        PFN_timeGetTime                 timeGetTime;
+        PFN_timeGetTime                 GetTime;
     } winmm;
 
     struct {
         HINSTANCE                       instance;
-        PFN_DirectInput8Create          DirectInput8Create;
+        PFN_DirectInput8Create          Create;
         IDirectInput8W*                 api;
     } dinput8;
 
     struct {
         HINSTANCE                       instance;
-        PFN_XInputGetCapabilities       XInputGetCapabilities;
-        PFN_XInputGetState              XInputGetState;
+        PFN_XInputGetCapabilities       GetCapabilities;
+        PFN_XInputGetState              GetState;
     } xinput;
 
     struct {
diff --git a/src/win32_time.c b/src/win32_time.c
index 6abfd1af..a533c377 100644
--- a/src/win32_time.c
+++ b/src/win32_time.c
@@ -64,7 +64,7 @@ uint64_t _glfwPlatformGetTimerValue(void)
         return value;
     }
     else
-        return (uint64_t) _glfw_timeGetTime();
+        return (uint64_t) timeGetTime();
 }
 
 uint64_t _glfwPlatformGetTimerFrequency(void)