From 7fec7a0569186301ea5fc3f94e950f44dafbee68 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Sun, 6 Dec 2015 15:53:10 +0100
Subject: [PATCH] Make source file names more consistent

Use platform prefix for files specific to that platform AND that have no
credible alternative API on that platform.

The exception is WinMM, which will be replaced before 3.2.
---
 src/CMakeLists.txt                         | 12 ++++++------
 src/{iokit_joystick.h => cocoa_joystick.h} |  0
 src/{iokit_joystick.m => cocoa_joystick.m} |  0
 src/cocoa_platform.h                       |  2 +-
 src/{mach_time.c => cocoa_time.c}          |  0
 src/{winmm_joystick.c => win32_joystick.c} |  0
 src/{winmm_joystick.h => win32_joystick.h} |  0
 src/win32_platform.h                       |  2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{iokit_joystick.h => cocoa_joystick.h} (100%)
 rename src/{iokit_joystick.m => cocoa_joystick.m} (100%)
 rename src/{mach_time.c => cocoa_time.c} (100%)
 rename src/{winmm_joystick.c => win32_joystick.c} (100%)
 rename src/{winmm_joystick.h => win32_joystick.h} (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8f84e35..8a1153ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,14 +12,14 @@ set(common_HEADERS internal.h
 set(common_SOURCES context.c init.c input.c monitor.c window.c)
 
 if (_GLFW_COCOA)
-    set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h iokit_joystick.h
+    set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h cocoa_joystick.h
                      posix_tls.h)
-    set(glfw_SOURCES ${common_SOURCES} cocoa_init.m cocoa_monitor.m
-                     cocoa_window.m iokit_joystick.m mach_time.c posix_tls.c)
+    set(glfw_SOURCES ${common_SOURCES} cocoa_init.m cocoa_joystick.m
+                     cocoa_monitor.m cocoa_window.m cocoa_time.c posix_tls.c)
 elseif (_GLFW_WIN32)
-    set(glfw_HEADERS ${common_HEADERS} win32_platform.h winmm_joystick.h)
-    set(glfw_SOURCES ${common_SOURCES} win32_init.c win32_monitor.c win32_time.c
-                     win32_tls.c win32_window.c winmm_joystick.c)
+    set(glfw_HEADERS ${common_HEADERS} win32_platform.h win32_joystick.h)
+    set(glfw_SOURCES ${common_SOURCES} win32_init.c win32_joystick.c
+                     win32_monitor.c win32_time.c win32_tls.c win32_window.c)
 elseif (_GLFW_X11)
     set(glfw_HEADERS ${common_HEADERS} x11_platform.h xkb_unicode.h
                      linux_joystick.h posix_time.h posix_tls.h)
diff --git a/src/iokit_joystick.h b/src/cocoa_joystick.h
similarity index 100%
rename from src/iokit_joystick.h
rename to src/cocoa_joystick.h
diff --git a/src/iokit_joystick.m b/src/cocoa_joystick.m
similarity index 100%
rename from src/iokit_joystick.m
rename to src/cocoa_joystick.m
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index e3088d08..14b93b12 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -39,7 +39,7 @@ typedef void* id;
 #endif
 
 #include "posix_tls.h"
-#include "iokit_joystick.h"
+#include "cocoa_joystick.h"
 
 #if defined(_GLFW_NSGL)
  #include "nsgl_context.h"
diff --git a/src/mach_time.c b/src/cocoa_time.c
similarity index 100%
rename from src/mach_time.c
rename to src/cocoa_time.c
diff --git a/src/winmm_joystick.c b/src/win32_joystick.c
similarity index 100%
rename from src/winmm_joystick.c
rename to src/win32_joystick.c
diff --git a/src/winmm_joystick.h b/src/win32_joystick.h
similarity index 100%
rename from src/winmm_joystick.h
rename to src/win32_joystick.h
diff --git a/src/win32_platform.h b/src/win32_platform.h
index 7c0d96d7..982a0749 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -140,7 +140,7 @@ typedef HRESULT (WINAPI * DWMFLUSH_T)(VOID);
 typedef HRESULT (WINAPI * SETPROCESSDPIAWARENESS_T)(PROCESS_DPI_AWARENESS);
 #define _glfw_SetProcessDPIAwareness _glfw.win32.shcore.SetProcessDPIAwareness
 
-#include "winmm_joystick.h"
+#include "win32_joystick.h"
 
 #if defined(_GLFW_WGL)
  #include "wgl_context.h"