Ticket #4742: patch.diff

src/kits/device/Joystick.cpp

@@ -30 +30 @@
     va_end(ap);
     fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile);
 }
+
 #   define LOG_ERR(text...) LOG(text)
-FILE *BJoystick::sLogFile = NULL;
+
+static FILE *sLogFile = NULL;
+
 #else
 #   define LOG(text...)
 #   define LOG_ERR(text...) fprintf(stderr, text)
@@ -361 +364 @@
     return B_ERROR;
 }
 
+
+void BJoystick::_ReservedJoystick1() {}
+void BJoystick::_ReservedJoystick2() {}
+void BJoystick::_ReservedJoystick3() {}
+status_t BJoystick::_Reserved_Joystick_4(void*, ...) { return B_ERROR; }
+status_t BJoystick::_Reserved_Joystick_5(void*, ...) { return B_ERROR; }
+status_t BJoystick::_Reserved_Joystick_6(void*, ...) { return B_ERROR; }

headers/os/device/Joystick.h

@@ -9 +9 @@
 #include <OS.h>
 #include <SupportDefs.h>
 
-#if DEBUG
-#include <stdio.h>
-#endif
 
 class BList;
 class BString;
@@ -80 +77 @@
             status_t        GatherEnhanced_info(const entry_ref* ref = NULL);
             status_t        SaveConfig(const entry_ref* ref = NULL);
 
+     
+            void            _ReservedJoystick1();
+    virtual void            _ReservedJoystick2();
+    virtual void            _ReservedJoystick3();
+    
             bool            fBeBoxMode;
             bool            fReservedBool;
             int             ffd;
             BList*          fDevices;
             _joystick_info* fJoystickInfo;
             char*           fDevName;
-#if DEBUG
-public:
-    static  FILE*           sLogFile;
-#endif
+            
+    virtual status_t        _Reserved_Joystick_4(void *, ...);
+    virtual status_t        _Reserved_Joystick_5(void *, ...);
+    virtual status_t        _Reserved_Joystick_6(void *, ...);
+            uint32          _reserved_Joystick_[10];
 };
 
 #endif // _JOYSTICK_H