From 04780d699685c227be9edd4a06f0c738f8d8022b Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue, 19 Apr 2011 22:37:53 +0200
Subject: client: remove c++ wrappers

client/ contains several .cpp file which only #include a .c file
of the same name. This is unusual and seems to only be done to
get C++ name mangling on the symbols defined in the C file.
Now that all headers files in common/ use extern "C", these
wrappers are no longer useful.
---
 client/windows/Makefile.am | 26 +++++++++++++-------------
 client/windows/redc.vcproj | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'client/windows')

diff --git a/client/windows/Makefile.am b/client/windows/Makefile.am
index 6d69511d..eae0bbe8 100644
--- a/client/windows/Makefile.am
+++ b/client/windows/Makefile.am
@@ -34,15 +34,15 @@ RED_COMMON_SRCS =					\
 	$(CLIENT_DIR)/demarshallers.h			\
 	$(CLIENT_DIR)/generated_demarshallers.cpp	\
 	$(CLIENT_DIR)/generated_demarshallers1.cpp	\
-	$(CLIENT_DIR)/marshaller.cpp			\
+	$(COMMON_DIR)/marshaller.c			\
 	$(CLIENT_DIR)/marshallers.h			\
 	$(CLIENT_DIR)/generated_marshallers.cpp		\
 	$(CLIENT_DIR)/generated_marshallers1.cpp	\
-	$(CLIENT_DIR)/sw_canvas.cpp			\
+	$(COMMON_DIR)/sw_canvas.c			\
 	$(CLIENT_DIR)/canvas.cpp			\
-	$(CLIENT_DIR)/gdi_canvas.cpp			\
+	$(COMMON_DIR)/gdi_canvas.c			\
 	$(CLIENT_DIR)/canvas.h				\
-	$(CLIENT_DIR)/canvas_utils.cpp			\
+	$(COMMON_DIR)/canvas_utils.c			\
 	$(CLIENT_DIR)/red_sw_canvas.cpp			\
 	$(CLIENT_DIR)/red_sw_canvas.h			\
 	$(CLIENT_DIR)/cmd_line_parser.cpp		\
@@ -72,21 +72,21 @@ RED_COMMON_SRCS =					\
 	$(CLIENT_DIR)/inputs_handler.h			\
 	$(CLIENT_DIR)/jpeg_decoder.cpp			\
 	$(CLIENT_DIR)/jpeg_decoder.h			\
-	$(CLIENT_DIR)/lz.cpp				\
-	$(CLIENT_DIR)/lines.cpp				\
+	$(COMMON_DIR)/lz.c				\
+	$(COMMON_DIR)/lines.c				\
 	$(CLIENT_DIR)/monitor.cpp			\
 	$(CLIENT_DIR)/monitor.h				\
-	$(CLIENT_DIR)/mem.cpp				\
+	$(COMMON_DIR)/mem.c				\
 	$(CLIENT_DIR)/menu.cpp				\
 	$(CLIENT_DIR)/menu.h				\
 	$(CLIENT_DIR)/mjpeg_decoder.h			\
 	$(CLIENT_DIR)/mjpeg_decoder.cpp			\
 	$(CLIENT_DIR)/pixels_source.h			\
-	$(CLIENT_DIR)/pixman_utils.cpp			\
+	$(COMMON_DIR)/pixman_utils.c			\
 	$(CLIENT_DIR)/platform.h			\
 	$(CLIENT_DIR)/playback_channel.cpp		\
 	$(CLIENT_DIR)/process_loop.cpp			\
-	$(CLIENT_DIR)/quic.cpp				\
+	$(COMMON_DIR)/quic.c				\
 	$(CLIENT_DIR)/record_channel.cpp		\
 	$(CLIENT_DIR)/red_channel.cpp			\
 	$(CLIENT_DIR)/red_channel.h			\
@@ -101,8 +101,8 @@ RED_COMMON_SRCS =					\
 	$(CLIENT_DIR)/red_pixmap.h			\
 	$(CLIENT_DIR)/red_types.h			\
 	$(CLIENT_DIR)/red_window.h			\
-	$(CLIENT_DIR)/region.cpp			\
-	$(CLIENT_DIR)/rop3.cpp				\
+	$(COMMON_DIR)/region.c				\
+	$(COMMON_DIR)/rop3.c				\
 	$(CLIENT_DIR)/screen.cpp			\
 	$(CLIENT_DIR)/screen.h				\
 	$(CLIENT_DIR)/screen_layer.cpp			\
@@ -137,8 +137,8 @@ endif
 
 if SUPPORT_GL
 RED_OGL_SRCS =						\
-	$(CLIENT_DIR)/gl_canvas.cpp			\
-	$(CLIENT_DIR)/glc.cpp				\
+	$(COMMON_DIR)/gl_canvas.c			\
+	$(COMMON_DIR)/glc.c				\
 	$(CLIENT_DIR)/red_gl_canvas.cpp			\
 	$(CLIENT_DIR)/red_gl_canvas.h			\
 	$(CLIENT_DIR)/red_pixmap_gl.h
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index b1b73410..0b1ecbf1 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -377,7 +377,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\canvas_utils.cpp"
+				RelativePath="..\..\common\canvas_utils.c"
 				>
 			</File>
 			<File
@@ -413,7 +413,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gdi_canvas.cpp"
+				RelativePath="..\..\common\gdi_canvas.c"
 				>
 			</File>
 			<File
@@ -457,11 +457,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\lines.cpp"
+				RelativePath="..\..\common\lines.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lz.cpp"
+				RelativePath="..\..\common\lz.c"
 				>
 			</File>
 			<File
@@ -469,7 +469,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\mem.cpp"
+				RelativePath="..\..\common\mem.c"
 				>
 			</File>
 			<File
@@ -533,7 +533,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\pixman_utils.cpp"
+				RelativePath="..\..\common\pixman_utils.c"
 				>
 			</File>
 			<File
@@ -557,7 +557,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\quic.cpp"
+				RelativePath="..\..\common\quic.c"
 				>
 			</File>
 			<File
@@ -609,7 +609,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\region.cpp"
+				RelativePath="..\..\common\region.c"
 				>
 			</File>
 			<File
@@ -617,7 +617,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\rop3.cpp"
+				RelativePath="..\..\common\rop3.c"
 				>
 			</File>
 			<File
@@ -637,7 +637,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\sw_canvas.cpp"
+				RelativePath="..\..\common\sw_canvas.c"
 				>
 			</File>
 			<File
@@ -767,7 +767,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\marshaller.cpp"
+				RelativePath="..\..\common\marshaller.c"
 				>
 			</File>
 			<File
-- 
cgit