Move common/2d/bitmap.c -> common/2d/bitmap.cpp

SConstruct

@@ -602,7 +602,7 @@ class DXXArchive(DXXCommon):
 	__objects_common = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
 '2d/2dsline.cpp',
 '2d/bitblt.cpp',
-'2d/bitmap.c',
+'2d/bitmap.cpp',
 '2d/box.c',
 '2d/canvas.c',
 '2d/circle.c',

common/2d/bitmap.h

@@ -1,7 +1,15 @@
 #ifndef _BITMAP_H
 #define _BITMAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void build_colormap_good( ubyte * palette, ubyte * colormap, int * freq );
 void decode_data(ubyte *data, int num_pixels, ubyte * colormap, int * count );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

common/include/u_mem.h

@@ -16,6 +16,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MEM_K 1.5	// Dynamic array growth factor
 
 void mem_init(void);
@@ -51,4 +55,8 @@ void mem_validate_heap();
 #define d_realloc(ptr,size) mem_realloc((ptr),(size),"Unknown", __FILE__,__LINE__ )
 #define d_free(ptr)         (mem_free(ptr), ptr=NULL)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // _U_MEM_H