Skip to content

Commit

Permalink
Revert "Allow incompatable va_list instead of ..."
Browse files Browse the repository at this point in the history
This reverts commit 5408a42.
  • Loading branch information
gerard-ryan-immersaview committed May 27, 2024
1 parent 5372d11 commit b313dbd
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 37 deletions.
6 changes: 3 additions & 3 deletions tests/expectations/va_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

typedef struct {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
} Interface_______i32_______va_list;

typedef struct {
Expand All @@ -19,7 +19,7 @@ int32_t va_list_test(...);

int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
6 changes: 3 additions & 3 deletions tests/expectations/va_list.compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

typedef struct {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
} Interface_______i32_______va_list;

typedef struct {
Expand All @@ -23,7 +23,7 @@ int32_t va_list_test(...);

int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
6 changes: 3 additions & 3 deletions tests/expectations/va_list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <ostream>
#include <new>

using VaListFnPtr = int32_t(*)(va_list);
using VaListFnPtr = int32_t(*)(...);

using VaListFnPtr2 = int32_t(*)();

Expand All @@ -19,11 +19,11 @@ int32_t va_list_test(...);

int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Interface<int32_t(*)(va_list)> fn5,
Interface<int32_t(*)(...)> fn5,
Interface<int32_t(*)()> fn6);

} // extern "C"
6 changes: 3 additions & 3 deletions tests/expectations/va_list.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ cdef extern from *:

cdef extern from *:

ctypedef int32_t (*VaListFnPtr)(va_list);
ctypedef int32_t (*VaListFnPtr)(...);

ctypedef int32_t (*VaListFnPtr2)();

ctypedef struct Interface_______i32_______va_list:
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);

ctypedef struct Interface_______i32:
int32_t (*fn1)();
Expand All @@ -20,7 +20,7 @@ cdef extern from *:

int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
10 changes: 5 additions & 5 deletions tests/expectations/va_list_both.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

typedef struct Interface_______i32_______va_list {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
} Interface_______i32_______va_list;

typedef struct Interface_______i32 {
int32_t (*fn1)(void);
} Interface_______i32;

int32_t va_list_test(va_list ap);
int32_t va_list_test(...);

int32_t va_list_test2(va_list ap);
int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
10 changes: 5 additions & 5 deletions tests/expectations/va_list_both.compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

typedef struct Interface_______i32_______va_list {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
} Interface_______i32_______va_list;

typedef struct Interface_______i32 {
Expand All @@ -19,11 +19,11 @@ typedef struct Interface_______i32 {
extern "C" {
#endif // __cplusplus

int32_t va_list_test(va_list ap);
int32_t va_list_test(...);

int32_t va_list_test2(va_list ap);
int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
10 changes: 5 additions & 5 deletions tests/expectations/va_list_tag.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

struct Interface_______i32_______va_list {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
};

struct Interface_______i32 {
int32_t (*fn1)(void);
};

int32_t va_list_test(va_list ap);
int32_t va_list_test(...);

int32_t va_list_test2(va_list ap);
int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
10 changes: 5 additions & 5 deletions tests/expectations/va_list_tag.compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <stdint.h>
#include <stdlib.h>

typedef int32_t (*VaListFnPtr)(va_list);
typedef int32_t (*VaListFnPtr)(...);

typedef int32_t (*VaListFnPtr2)(void);

struct Interface_______i32_______va_list {
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);
};

struct Interface_______i32 {
Expand All @@ -19,11 +19,11 @@ struct Interface_______i32 {
extern "C" {
#endif // __cplusplus

int32_t va_list_test(va_list ap);
int32_t va_list_test(...);

int32_t va_list_test2(va_list ap);
int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(void),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down
10 changes: 5 additions & 5 deletions tests/expectations/va_list_tag.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ cdef extern from *:

cdef extern from *:

ctypedef int32_t (*VaListFnPtr)(va_list);
ctypedef int32_t (*VaListFnPtr)(...);

ctypedef int32_t (*VaListFnPtr2)();

cdef struct Interface_______i32_______va_list:
int32_t (*fn1)(va_list);
int32_t (*fn1)(...);

cdef struct Interface_______i32:
int32_t (*fn1)();

int32_t va_list_test(va_list ap);
int32_t va_list_test(...);

int32_t va_list_test2(va_list ap);
int32_t va_list_test2(...);

void va_list_fn_ptrs(int32_t (*fn1)(va_list),
void va_list_fn_ptrs(int32_t (*fn1)(...),
int32_t (*fn2)(),
VaListFnPtr fn3,
VaListFnPtr2 fn4,
Expand Down

0 comments on commit b313dbd

Please sign in to comment.