ObjFW  Check-in [d00e214244]

Overview
Comment:Fix compilation on non-Linux
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d00e214244e0f6c4486bebdd7820c051ec1bab4c126c6cdd45faa8366a2b727c
User & Date: js on 2024-06-17 00:54:05
Other Links: manifest | tags
Context
2024-06-17
00:59
Fix Nintendo DS / 3DS / Switch / Wii check-in: 02797b8805 user: js tags: trunk
00:54
Fix compilation on non-Linux check-in: d00e214244 user: js tags: trunk
00:51
Make GCC happy again check-in: 73a310f77c user: js tags: trunk
Changes

Modified src/hid/OHDualSenseGamepad.h from [f2cfd95c64] to [5baab465cd].

20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHDualSenseGamepad: OFObject <OHExtendedGamepad,
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}







|

|







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHDualSenseGamepad: OFObject <OHExtendedGamepad
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    , OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}

Modified src/hid/OHDualShock4Gamepad.h from [9090fc285e] to [09c34e1c97].

20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHDualShock4Gamepad: OFObject <OHExtendedGamepad,
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}







|

|







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHDualShock4Gamepad: OFObject <OHExtendedGamepad
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    , OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}

Modified src/hid/OHStadiaGamepad.h from [62eb2458d1] to [13c58b066a].

20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHStadiaGamepad: OFObject <OHExtendedGamepad,
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}







|

|







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#import "OHExtendedGamepad.h"
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# import "OHEvdevGameController.h"
#endif

OF_ASSUME_NONNULL_BEGIN

@interface OHStadiaGamepad: OFObject <OHExtendedGamepad
#if defined(OF_LINUX) && defined(OF_HAVE_FILES)
    , OHEvdevMapping
#endif
>
{
	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
	    *_directionalPads;
}