summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-30 14:57:10 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2014-02-13 17:38:01 +0100
commit6314fbac7555148952ba27ff2fc0f2e2ed082e11 (patch)
tree297ac8d6b8fca06fdcade7f1497c94385bfc3bed
parentede1efb05f1dbf95f458a2f95fb793ebf16d8f69 (diff)
server: rename _tmpl files
-rw-r--r--client/Makefile.am2
-rw-r--r--client/glz_decoder.cpp22
-rw-r--r--server/Makefile.am8
-rw-r--r--server/cache_item.c.template (renamed from server/cache_item.tmpl.c)0
-rw-r--r--server/cursor_channel.c2
-rw-r--r--server/dcc.c2
-rw-r--r--server/glz_encode.c.template (renamed from server/glz_encode_tmpl.c)0
-rw-r--r--server/glz_encode_match.c.template (renamed from server/glz_encode_match_tmpl.c)0
-rw-r--r--server/glz_encoder.c14
-rw-r--r--server/red_bitmap_utils.c6
-rw-r--r--server/red_bitmap_utils.c.template (renamed from server/red_bitmap_utils_tmpl.c)0
11 files changed, 28 insertions, 28 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 97b56f6c..b86b9e56 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -235,7 +235,7 @@ spicec_LDADD = \
$(NULL)
EXTRA_DIST = \
- glz_decode_tmpl.c \
+ glz_decode.c.template \
x11/images/red_icon.c \
x11/images/alt_image.c \
gui/commonv2c.ttf.c \
diff --git a/client/glz_decoder.cpp b/client/glz_decoder.cpp
index d6880517..1fb28f9c 100644
--- a/client/glz_decoder.cpp
+++ b/client/glz_decoder.cpp
@@ -157,48 +157,48 @@ typedef uint16_t rgb16_pixel_t;
#undef ATTR_PACKED
#define LZ_PLT
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_PLT
#define PLT8
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_PLT
#define PLT4_BE
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_PLT
#define PLT4_LE
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_PLT
#define PLT1_BE
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_PLT
#define PLT1_LE
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_RGB16
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_RGB16
#define TO_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_RGB24
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_RGB32
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#define LZ_RGB_ALPHA
-#include "glz_decode_tmpl.c"
+#include "glz_decode.c.template"
#undef LZ_UNEXPECT_CONDITIONAL
#undef LZ_EXPECT_CONDITIONAL
diff --git a/server/Makefile.am b/server/Makefile.am
index a99d17f2..f679b18a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -139,10 +139,10 @@ libspice_serverinclude_HEADERS = \
$(NULL)
EXTRA_DIST = \
- red_bitmap_utils_tmpl.c \
- cache_item.tmpl.c \
- glz_encode_match_tmpl.c \
- glz_encode_tmpl.c \
+ red_bitmap_utils.c.template \
+ cache_item.c.template \
+ glz_encode_match.c.template \
+ glz_encode.c.template \
spice-server.syms \
$(NULL)
diff --git a/server/cache_item.tmpl.c b/server/cache_item.c.template
index dc314c05..dc314c05 100644
--- a/server/cache_item.tmpl.c
+++ b/server/cache_item.c.template
diff --git a/server/cursor_channel.c b/server/cursor_channel.c
index 4a074773..609e7639 100644
--- a/server/cursor_channel.c
+++ b/server/cursor_channel.c
@@ -64,7 +64,7 @@ struct _CursorChannelClient {
#define RCC_TO_CCC(rcc) SPICE_CONTAINEROF((rcc), CursorChannelClient, common.base)
#define CLIENT_CURSOR_CACHE
-#include "cache_item.tmpl.c"
+#include "cache_item.c.template"
#undef CLIENT_CURSOR_CACHE
static CursorItem *cursor_item_new(QXLInstance *qxl, RedCursorCmd *cmd, uint32_t group_id)
diff --git a/server/dcc.c b/server/dcc.c
index c1549259..59e977f2 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -1072,7 +1072,7 @@ int dcc_compress_image(DisplayChannelClient *dcc,
}
#define CLIENT_PALETTE_CACHE
-#include "cache_item.tmpl.c"
+#include "cache_item.c.template"
#undef CLIENT_PALETTE_CACHE
void dcc_palette_cache_palette(DisplayChannelClient *dcc, SpicePalette *palette,
diff --git a/server/glz_encode_tmpl.c b/server/glz_encode.c.template
index 89092a97..89092a97 100644
--- a/server/glz_encode_tmpl.c
+++ b/server/glz_encode.c.template
diff --git a/server/glz_encode_match_tmpl.c b/server/glz_encode_match.c.template
index 1fd251ee..1fd251ee 100644
--- a/server/glz_encode_match_tmpl.c
+++ b/server/glz_encode_match.c.template
diff --git a/server/glz_encoder.c b/server/glz_encoder.c
index 741bad89..b0c1cfd8 100644
--- a/server/glz_encoder.c
+++ b/server/glz_encoder.c
@@ -202,24 +202,24 @@ typedef uint16_t rgb16_pixel_t;
#define GLZ_ENCODE_SIZE
-#include "glz_encode_match_tmpl.c"
+#include "glz_encode_match.c.template"
#define GLZ_ENCODE_MATCH
-#include "glz_encode_match_tmpl.c"
+#include "glz_encode_match.c.template"
#define LZ_PLT
-#include "glz_encode_tmpl.c"
+#include "glz_encode.c.template"
#define LZ_RGB16
-#include "glz_encode_tmpl.c"
+#include "glz_encode.c.template"
#define LZ_RGB24
-#include "glz_encode_tmpl.c"
+#include "glz_encode.c.template"
#define LZ_RGB32
-#include "glz_encode_tmpl.c"
+#include "glz_encode.c.template"
#define LZ_RGB_ALPHA
-#include "glz_encode_tmpl.c"
+#include "glz_encode.c.template"
int glz_encode(GlzEncoderContext *opaque_encoder,
diff --git a/server/red_bitmap_utils.c b/server/red_bitmap_utils.c
index d293dae1..33886dcf 100644
--- a/server/red_bitmap_utils.c
+++ b/server/red_bitmap_utils.c
@@ -1,11 +1,11 @@
#include "red_bitmap_utils.h"
#define RED_BITMAP_UTILS_RGB16
-#include "red_bitmap_utils_tmpl.c"
+#include "red_bitmap_utils.c.template"
#define RED_BITMAP_UTILS_RGB24
-#include "red_bitmap_utils_tmpl.c"
+#include "red_bitmap_utils.c.template"
#define RED_BITMAP_UTILS_RGB32
-#include "red_bitmap_utils_tmpl.c"
+#include "red_bitmap_utils.c.template"
#define GRADUAL_HIGH_RGB24_TH -0.03
#define GRADUAL_HIGH_RGB16_TH 0
diff --git a/server/red_bitmap_utils_tmpl.c b/server/red_bitmap_utils.c.template
index 6d508a7c..6d508a7c 100644
--- a/server/red_bitmap_utils_tmpl.c
+++ b/server/red_bitmap_utils.c.template