From bd467b41400e54676a35395fd42a1e4f6b026164 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 11 Nov 2012 22:12:51 +0000
Subject: [PATCH] Move similar/main/inferno.c -> similar/main/inferno.cpp

---
 SConstruct                              | 2 +-
 common/include/args.h                   | 8 ++++++++
 common/main/bm.h                        | 8 ++++++++
 similar/main/{inferno.c => inferno.cpp} | 0
 4 files changed, 17 insertions(+), 1 deletion(-)
 rename similar/main/{inferno.c => inferno.cpp} (100%)

diff --git a/SConstruct b/SConstruct
index 5f9b79db9..a460a0b43 100644
--- a/SConstruct
+++ b/SConstruct
@@ -770,7 +770,7 @@ class DXXProgram(DXXCommon):
 'main/gauges.cpp',
 'main/hostage.cpp',
 'main/hud.cpp',
-'main/inferno.c',
+'main/inferno.cpp',
 'main/kconfig.c',
 'main/kmatrix.c',
 'main/laser.c',
diff --git a/common/include/args.h b/common/include/args.h
index 8b59540c5..384cbf2b3 100644
--- a/common/include/args.h
+++ b/common/include/args.h
@@ -21,6 +21,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _ARGS_H
 #define _ARGS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void InitArgs(int argc, char **argv);
 extern void args_exit();
 
@@ -112,4 +116,8 @@ typedef struct Arg
 
 extern struct Arg GameArg;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/common/main/bm.h b/common/main/bm.h
index f253a0ae3..5fbace4cd 100644
--- a/common/main/bm.h
+++ b/common/main/bm.h
@@ -23,6 +23,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gr.h"
 #include "piggy.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(DXX_BUILD_DESCENT_I)
 #define MAX_TEXTURES		800
 #elif defined(DXX_BUILD_DESCENT_II)
@@ -141,4 +145,8 @@ int ds_load(int skip, const char * filename );
 int compute_average_pixel(grs_bitmap *n);
 void bm_write_all(PHYSFS_file *fp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BM_H */
diff --git a/similar/main/inferno.c b/similar/main/inferno.cpp
similarity index 100%
rename from similar/main/inferno.c
rename to similar/main/inferno.cpp