From 2969c01d55f96d84c3e493fa69845affe6f12fdc Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Fri, 27 Oct 2000 02:23:51 +0000
Subject: [PATCH] Remove gcc-only macro definition
---
src/backend/utils/mb/conv.c | 14 +++++++++++++-
src/include/mb/pg_wchar.h | 4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index d55bedcd393..ff7375df0dd 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
* WIN1250 client encoding support contributed by Pavel Behal
* SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
*
- * $Id: conv.c,v 1.18 2000/10/12 06:06:50 ishii Exp $
+ * $Id: conv.c,v 1.19 2000/10/27 02:23:51 ishii Exp $
*
*
*/
@@ -16,6 +16,18 @@
#include "mb/pg_wchar.h"
+/*
+ * XXX dummy elog() function for frontend only. Note that elog would
+ * never be called from frontend, but to avoid the linking errors we
+ * have to do it anyway. In the future, we should consider reorganizing
+ * sources in this directory to avoid this kind of ugliness...
+*/
+
+#ifdef FRONTEND
+static void
+elog(int lev, const char *fmt, ...) {}
+#endif
+
/*
* for Unicode (UTF-8) support
*/
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 342ea8757e3..136ead966c9 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -1,4 +1,4 @@
-/* $Id: pg_wchar.h,v 1.20 2000/10/25 19:44:43 tgl Exp $ */
+/* $Id: pg_wchar.h,v 1.21 2000/10/27 02:21:15 ishii Exp $ */
#ifndef PG_WCHAR_H
#define PG_WCHAR_H
@@ -7,9 +7,9 @@
#include <sys/types.h>
#ifdef FRONTEND
-#define elog(X...)
#undef palloc
#define palloc malloc
+# undef pfree
#define pfree free
#endif
--
GitLab