From 4d026f8b69e92eedaab041b3d1c5326d65c6408a Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Nov 2012 22:12:51 +0000 Subject: [PATCH] Move similar/2d/pcx.c -> similar/2d/pcx.cpp --- SConstruct | 2 +- common/include/pcx.h | 8 ++++++++ similar/2d/{pcx.c => pcx.cpp} | 0 3 files changed, 9 insertions(+), 1 deletion(-) rename similar/2d/{pcx.c => pcx.cpp} (100%) diff --git a/SConstruct b/SConstruct index 4c9297263..c4f825aad 100644 --- a/SConstruct +++ b/SConstruct @@ -742,7 +742,7 @@ class DXXProgram(DXXCommon): 'source':[os.path.join('similar', f) for f in [ '2d/font.cpp', '2d/palette.cpp', -'2d/pcx.c', +'2d/pcx.cpp', '3d/interp.c', 'arch/sdl/digi.c', 'arch/sdl/digi_audio.c', diff --git a/common/include/pcx.h b/common/include/pcx.h index e3b72c93b..740d29b13 100644 --- a/common/include/pcx.h +++ b/common/include/pcx.h @@ -20,6 +20,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _PCX_H #define _PCX_H +#ifdef __cplusplus +extern "C" { +#endif + #define PCX_ERROR_NONE 0 #define PCX_ERROR_OPENING 1 #define PCX_ERROR_NO_HEADER 2 @@ -46,4 +50,8 @@ extern int pcx_write_bitmap( const char * filename, grs_bitmap * bmp, ubyte * pa extern const char *pcx_errormsg(int error_number); +#ifdef __cplusplus +} +#endif + #endif diff --git a/similar/2d/pcx.c b/similar/2d/pcx.cpp similarity index 100% rename from similar/2d/pcx.c rename to similar/2d/pcx.cpp