zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-19 10:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some extern "C".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6137 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-05 10:04:56 +00:00
parent 66f43bca24
commit 83c06a63b9
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/build/include/build.h
View file

@ -270,8 +270,6 @@ static FORCE_INLINE void sprite_tracker_hook(uintptr_t address);
#define Tracker(Container, Type) Container##Tracker<Type> #define Tracker(Container, Type) Container##Tracker<Type>
#define TrackerCast(x) x.cast() #define TrackerCast(x) x.cast()
extern "C" {
#else #else
#define Tracker(Container, Type) Type #define Tracker(Container, Type) Type
@ -475,6 +473,10 @@ static inline void inplace_vx_tweak_wall(walltypevx *vxwal, int32_t yaxp)
#include "clip.h" #include "clip.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct { typedef struct {
uint32_t mdanimtims; uint32_t mdanimtims;
int16_t mdanimcur; int16_t mdanimcur;
@ -1344,6 +1346,10 @@ int32_t loaddefinitionsfile(const char *fn);
// -2, board is dodgy // -2, board is dodgy
int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum); int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum);
#ifdef __cplusplus
}
#endif
#include "hash.h" #include "hash.h"
#ifdef POLYMER #ifdef POLYMER
@ -1354,6 +1360,10 @@ int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_
# endif # endif
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
static FORCE_INLINE void push_nofog(void) static FORCE_INLINE void push_nofog(void)
{ {
#ifdef USE_OPENGL #ifdef USE_OPENGL

7
source/mact/include/keyboard.h
View file

@ -29,13 +29,14 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
#ifndef keyboard_public_h_ #ifndef keyboard_public_h_
#define keyboard_public_h_ #define keyboard_public_h_
#ifdef __cplusplus
extern "C" {
#endif
#include "baselayer.h" // for the keyboard stuff #include "baselayer.h" // for the keyboard stuff
#include "scancodes.h" #include "scancodes.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef uint8_t kb_scancode; typedef uint8_t kb_scancode;
#define MAXKEYBOARDSCAN 256 #define MAXKEYBOARDSCAN 256