From 5aa766c8cb2d1705a2f15c80a2f78be7c5136796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Mon, 6 Sep 1999 12:52:19 +0200
Subject: [PATCH] Now uses PIKE_CONCAT().
Rev: src/modules/Image/encodings/psd.c:1.13
---
src/modules/Image/encodings/psd.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/modules/Image/encodings/psd.c b/src/modules/Image/encodings/psd.c
index c90d03998a..5bebf253e8 100644
--- a/src/modules/Image/encodings/psd.c
+++ b/src/modules/Image/encodings/psd.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: psd.c,v 1.12 1999/07/16 19:22:42 per Exp $");
+RCSID("$Id: psd.c,v 1.13 1999/09/06 10:52:19 grubba Exp $");
#include "image_machine.h"
@@ -38,7 +38,7 @@ extern struct program *image_program;
**!
*/
-#define STRING(X) static struct pike_string *s_##X;
+#define STRING(X) static struct pike_string *PIKE_CONCAT(s_, X);
#include "psd_constant_strings.h"
#undef STRING
@@ -646,7 +646,8 @@ void init_image_psd()
add_integer_constant("LAYER_FLAG_BIT4", 0x04, 0 );
add_integer_constant("LAYER_FLAG_NOPIX", 0x08, 0 );
-#define STRING(X) s_##X = make_shared_binary_string(#X,sizeof( #X )-sizeof(""));
+#define STRING(X) PIKE_CONCAT(s_, X) = \
+ make_shared_binary_string(#X,sizeof( #X )-sizeof(""))
#include "psd_constant_strings.h"
#undef STRING
}
@@ -654,7 +655,7 @@ void init_image_psd()
void exit_image_psd()
{
-#define STRING(X) free_string(s_##X)
+#define STRING(X) free_string(PIKE_CONCAT(s_, X))
#include "psd_constant_strings.h"
#undef STRING
}
--
GitLab