From e2b7b802e39f9a94accb1b35109e1e0fb460616d Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Nov 2012 22:12:51 +0000 Subject: [PATCH] Move similar/arch/sdl/digi.c -> similar/arch/sdl/digi.cpp --- SConstruct | 2 +- common/include/digi_audio.h | 8 ++++++++ common/main/digi.h | 8 ++++++++ similar/arch/sdl/{digi.c => digi.cpp} | 0 4 files changed, 17 insertions(+), 1 deletion(-) rename similar/arch/sdl/{digi.c => digi.cpp} (100%) diff --git a/SConstruct b/SConstruct index 5a77b80de..b4aced5c1 100644 --- a/SConstruct +++ b/SConstruct @@ -744,7 +744,7 @@ class DXXProgram(DXXCommon): '2d/palette.cpp', '2d/pcx.cpp', '3d/interp.cpp', -'arch/sdl/digi.c', +'arch/sdl/digi.cpp', 'arch/sdl/digi_audio.c', 'arch/sdl/event.c', 'arch/sdl/init.c', diff --git a/common/include/digi_audio.h b/common/include/digi_audio.h index bc0a5b5c5..336d96ee7 100644 --- a/common/include/digi_audio.h +++ b/common/include/digi_audio.h @@ -3,6 +3,10 @@ #include "maths.h" +#ifdef __cplusplus +extern "C" { +#endif + int digi_audio_init(); void digi_audio_reset(); void digi_audio_close(); @@ -17,4 +21,8 @@ void digi_audio_end_sound(int ); void digi_audio_set_digi_volume(int); void digi_audio_debug(); +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/main/digi.h b/common/main/digi.h index 32f903ea6..1fccd5d20 100644 --- a/common/main/digi.h +++ b/common/main/digi.h @@ -25,6 +25,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "vecmat.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct digi_sound { int bits; int freq; @@ -127,4 +131,8 @@ void digi_win32_resume_midi_song(); void digi_win32_stop_midi_song(); #endif +#ifdef __cplusplus +} +#endif + #endif diff --git a/similar/arch/sdl/digi.c b/similar/arch/sdl/digi.cpp similarity index 100% rename from similar/arch/sdl/digi.c rename to similar/arch/sdl/digi.cpp