i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make it a valid C header again.

Browse Source 
* Cleanup of include grouping as pointed out by Axel.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41899 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2011-06-03 23:31:05 +00:00
parent e36050e83d
commit a4aa4541c1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/device/joystick_driver.h
+5 -2
View File
@@ -13,10 +13,11 @@
#ifndef _JOYSTICK_DRIVER_H #ifndef _JOYSTICK_DRIVER_H
#define _JOYSTICK_DRIVER_H #define _JOYSTICK_DRIVER_H
#include <stdlib.h>
#include <SupportDefs.h> #include <SupportDefs.h>
#include <Drivers.h> #include <Drivers.h>
#include <module.h> #include <module.h>
#include <stdlib.h>
typedef struct _joystick { typedef struct _joystick {
bigtime_t timestamp; bigtime_t timestamp;
@@ -47,7 +48,8 @@ typedef struct _extended_joystick {
// make storing and accessing the flat data in the "data" member easier. When // make storing and accessing the flat data in the "data" member easier. When
// transferring data via read/write/ioctl only the flat data in "data" is ever // transferring data via read/write/ioctl only the flat data in "data" is ever
// transmitted, not the whole structure. // transmitted, not the whole structure.
typedef struct variable_joystick { typedef struct _variable_joystick {
#ifdef __cplusplus
status_t initialize(uint32 axisCount, uint32 hatCount, uint32 buttonCount) status_t initialize(uint32 axisCount, uint32 hatCount, uint32 buttonCount)
{ {
axis_count = axisCount; axis_count = axisCount;
@@ -75,6 +77,7 @@ typedef struct variable_joystick {
{ {
return initialize(MAX_AXES, MAX_HATS, MAX_BUTTONS); return initialize(MAX_AXES, MAX_HATS, MAX_BUTTONS);
} }
#endif
uint32 axis_count; uint32 axis_count;
uint32 hat_count; uint32 hat_count;