Commit 33e826d1 authored by Bruce Momjian's avatar Bruce Momjian

Fix for multi-byte includes.

parent df454bd8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.52 1999/07/16 05:00:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.53 1999/07/17 16:25:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
#endif
#ifdef CYR_RECODE #ifdef CYR_RECODE
char *convertstr(char *, int, int); char *convertstr(char *, int, int);
#endif #endif
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.46 1999/07/16 17:46:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.47 1999/07/17 16:25:25 momjian Exp $
* *
* NOTES * NOTES
* InitPostgres() is the function called from PostgresMain * InitPostgres() is the function called from PostgresMain
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
#include "utils/syscache.h" #include "utils/syscache.h"
#include "version.h" #include "version.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
#endif
static void VerifySystemDatabase(void); static void VerifySystemDatabase(void);
static void VerifyMyDatabase(void); static void VerifyMyDatabase(void);
static void InitCommunication(void); static void InitCommunication(void);
......
...@@ -3,11 +3,13 @@ ...@@ -3,11 +3,13 @@
* client encoding and server internal encoding. * client encoding and server internal encoding.
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * Tatsuo Ishii
* $Id: mbutils.c,v 1.6 1999/05/25 16:12:43 momjian Exp $ */ * $Id: mbutils.c,v 1.7 1999/07/17 16:25:26 momjian Exp $ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "postgres.h"
#include "miscadmin.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
static int client_encoding = -1; static int client_encoding = -1;
......
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
* This file contains some public functions * This file contains some public functions
* related to show/set/reset variable commands. * related to show/set/reset variable commands.
* Tatsuo Ishii * Tatsuo Ishii
* $Id: variable.c,v 1.4 1999/05/25 16:12:44 momjian Exp $ * $Id: variable.c,v 1.5 1999/07/17 16:25:27 momjian Exp $
*/ */
#include "postgres.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
bool bool
......
/* $Id: pg_wchar.h,v 1.10 1999/07/14 01:20:20 momjian Exp $ */ /* $Id: pg_wchar.h,v 1.11 1999/07/17 16:25:28 momjian Exp $ */
#ifndef PG_WCHAR_H #ifndef PG_WCHAR_H
#define PG_WCHAR_H #define PG_WCHAR_H
#include <sys/types.h> #include <sys/types.h>
#include "c.h"
#define SQL_ASCII 0 /* SQL/ASCII */ #define SQL_ASCII 0 /* SQL/ASCII */
#define EUC_JP 1 /* EUC for Japanese */ #define EUC_JP 1 /* EUC for Japanese */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment