Skip to content

Commit 2969c01

Browse files
committed
Remove gcc-only macro definition
1 parent 063c0f6 commit 2969c01

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/backend/utils/mb/conv.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* WIN1250 client encoding support contributed by Pavel Behal
77
* SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
88
*
9-
* $Id: conv.c,v 1.18 2000/10/12 06:06:50 ishii Exp $
9+
* $Id: conv.c,v 1.19 2000/10/27 02:23:51 ishii Exp $
1010
*
1111
*
1212
*/
@@ -16,6 +16,18 @@
1616

1717
#include "mb/pg_wchar.h"
1818

19+
/*
20+
* XXX dummy elog() function for frontend only. Note that elog would
21+
* never be called from frontend, but to avoid the linking errors we
22+
* have to do it anyway. In the future, we should consider reorganizing
23+
* sources in this directory to avoid this kind of ugliness...
24+
*/
25+
26+
#ifdef FRONTEND
27+
static void
28+
elog(int lev, const char *fmt, ...) {}
29+
#endif
30+
1931
/*
2032
* for Unicode (UTF-8) support
2133
*/

src/include/mb/pg_wchar.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: pg_wchar.h,v 1.20 2000/10/25 19:44:43 tgl Exp $ */
1+
/* $Id: pg_wchar.h,v 1.21 2000/10/27 02:21:15 ishii Exp $ */
22

33
#ifndef PG_WCHAR_H
44
#define PG_WCHAR_H
@@ -7,9 +7,9 @@
77
#include <sys/types.h>
88

99
#ifdef FRONTEND
10-
#define elog(X...)
1110
#undef palloc
1211
#define palloc malloc
12+
# undef pfree
1313
#define pfree free
1414
#endif
1515

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy