Cleanup some vi footer comments, rename new PRIVATE_* funcs to MacHap…

…tic_*.
libsdl-org · Feb 5, 2014 · 7f94268 · 7f94268
1 parent 7afbb8c
commit 7f94268
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/src/haptic/SDL_syshaptic.h b/src/haptic/SDL_syshaptic.h
@@ -205,3 +205,6 @@ extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
  * Returns 0 on success, -1 on error.
  */
 extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
@@ -173,7 +173,7 @@ SDL_SYS_HapticInit(void)
     }
 
     while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
-        PRIVATE_MaybeAddDevice(device);
+        MacHaptic_MaybeAddDevice(device);
         /* always release as the AddDevice will retain IF it's a forcefeedback device */
         IOObjectRelease(device);
     }
@@ -207,7 +207,7 @@ HapticByDevIndex(int device_index)
 }
 
 int
-PRIVATE_MaybeAddDevice( io_object_t device )
+MacHaptic_MaybeAddDevice( io_object_t device )
 {
     IOReturn result;
     CFMutableDictionaryRef hidProperties;
@@ -283,7 +283,7 @@ PRIVATE_MaybeAddDevice( io_object_t device )
 }
 
 int
-PRIVATE_MaybeRemoveDevice( io_object_t device )
+MacHaptic_MaybeRemoveDevice( io_object_t device )
 {
     SDL_hapticlist_item *item;
     SDL_hapticlist_item *prev = NULL;

diff --git a/src/haptic/darwin/SDL_syshaptic_c.h b/src/haptic/darwin/SDL_syshaptic_c.h
@@ -1,26 +1,26 @@
 /*
- Simple DirectMedia Layer
- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
- 
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- 
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- 
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
- */
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
 
-int
-PRIVATE_MaybeAddDevice( io_object_t device );
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern int MacHaptic_MaybeAddDevice( io_object_t device );
+extern int MacHaptic_MaybeRemoveDevice( io_object_t device );
+
+/* vi: set ts=4 sw=4 expandtab: */
 
-int
-PRIVATE_MaybeRemoveDevice( io_object_t device );
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
@@ -124,7 +124,7 @@ HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
     recDevice *device = (recDevice *) refcon;
     device->removed = 1;
 #if SDL_HAPTIC_IOKIT
-    PRIVATE_MaybeRemoveDevice(device->ffservice);
+    MacHaptic_MaybeRemoveDevice(device->ffservice);
 #endif
     s_bDeviceRemoved = SDL_TRUE;
 }
@@ -139,7 +139,7 @@ void JoystickDeviceWasRemovedCallback( void * refcon, io_service_t service, natu
         recDevice *device = (recDevice *) refcon;
         device->removed = 1;
 #if SDL_HAPTIC_IOKIT
-        PRIVATE_MaybeRemoveDevice(device->ffservice);
+        MacHaptic_MaybeRemoveDevice(device->ffservice);
 #endif
         s_bDeviceRemoved = SDL_TRUE;
     }
@@ -687,7 +687,7 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
     if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
         device->ffservice = ioHIDDeviceObject;
 #if SDL_HAPTIC_IOKIT
-        PRIVATE_MaybeAddDevice(ioHIDDeviceObject);
+        MacHaptic_MaybeAddDevice(ioHIDDeviceObject);
 #endif
     } else {
         device->ffservice = 0;