database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00
Code

Allow compilation when CODESET is not defined (OpenBSD).

Browse Source
This commit is contained in:
Peter Eisentraut 2004-08-11 11:06:23 +00:00
parent 7a7ffe944d
commit 81cca21818
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/initdb/initdb.c
View File

@ -39,7 +39,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.47 2004/08/09 20:20:47 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.48 2004/08/11 11:06:23 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -619,7 +619,7 @@ get_encoding_id(char *encoding_name)
exit(1); exit(1);
} }
#ifdef HAVE_LANGINFO_H #if defined(HAVE_LANGINFO_H) && defined(CODESET)
/* /*
* Checks whether the encoding selected for PostgreSQL and the * Checks whether the encoding selected for PostgreSQL and the
* encoding used by the system locale match. * encoding used by the system locale match.
@ -802,7 +802,7 @@ find_matching_encoding(const char *ctype)
free(sys); free(sys);
return -1; return -1;
} }
#endif /* HAVE_LANGINFO_H */ #endif /* HAVE_LANGINFO_H && CODESET */
/* /*
* get short version of VERSION * get short version of VERSION
@ -2322,7 +2322,7 @@ main(int argc, char *argv[])
lc_time); lc_time);
} }
#ifdef HAVE_LANGINFO_H #if defined(HAVE_LANGINFO_H) && defined(CODESET)
if (strcmp(lc_ctype, "C") != 0 && strcmp(lc_ctype, "POSIX") != 0) if (strcmp(lc_ctype, "C") != 0 && strcmp(lc_ctype, "POSIX") != 0)
{ {
if (strlen(encoding) == 0) if (strlen(encoding) == 0)
@ -2346,7 +2346,7 @@ main(int argc, char *argv[])
else else
check_encodings_match(atoi(encodingid), lc_ctype); check_encodings_match(atoi(encodingid), lc_ctype);
} }
#endif /* HAVE_LANGINFO_H */ #endif /* HAVE_LANGINFO_H && CODESET */
printf("\n"); printf("\n");