Move similar/main/inferno.c -> similar/main/inferno.cpp

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',

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

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 */