Skip to content

Commit 936321b

Browse files
committed
Moved various structs and enums out of extern "C" fields
1 parent eb7cdf4 commit 936321b

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

ttyd-tools/rel/include/gc/card.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace gc::card {
66

7-
extern "C" {
8-
97
#define CARD_SLOT_A 0 // Memory card slot A
108
#define CARD_SLOT_B 1 // Memory card slot B
119

@@ -59,6 +57,8 @@ typedef struct CARDStat {
5957

6058
typedef void (*CARDCallback)(int32_t channel, int32_t result);
6159

60+
extern "C" {
61+
6262
int32_t CARDGetResultCode(int32_t channel);
6363
int32_t CARDProbeEx(int32_t channel, int32_t *memSize, int32_t *sectorSize);
6464
int32_t CARDMountAsync(int32_t channel, void *workArea, CARDCallback detachCallback, CARDCallback attachCallback);

ttyd-tools/rel/include/gc/gx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace gc::gx {
66

7-
extern "C" {
8-
97
enum class GXPrimitive
108
{
119
GX_QUADS = 128,
@@ -44,6 +42,8 @@ enum class GXChannelID
4442
GX_COLOR_NULL = 255,
4543
};
4644

45+
extern "C" {
46+
4747
void GXBegin(GXPrimitive type, GXVtxFmt vtxFmt, uint16_t nVerts);
4848
void GXSetChanMatColor(GXChannelID chan, uint8_t matColor[4]);
4949

ttyd-tools/rel/include/gc/ppc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace gc::ppc {
66

7-
extern "C" {
8-
97
typedef union WriteGatherPipe
108
{
119
int8_t s8;
@@ -20,6 +18,8 @@ typedef union WriteGatherPipe
2018
double f64;
2119
} WriteGatherPipe;
2220

21+
extern "C" {
22+
2323
extern volatile WriteGatherPipe writeGatherPipe;
2424

2525
}

ttyd-tools/rel/include/ttyd/event.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace ttyd::event {
66

7-
extern "C" {
8-
97
struct EventStageEventDescription
108
{
119
uint8_t entryMotionType;
@@ -34,6 +32,8 @@ struct EventStageDescription
3432
uint32_t eventCount;
3533
} __attribute__((__packed__));
3634

35+
extern "C" {
36+
3737
int32_t eventStgNum();
3838
EventStageDescription *eventStgDtPtr(int32_t stageId);
3939
// stg8_15_init

0 commit comments

Comments
 (0)