mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed order of include file search path.

Browse Source
This commit is contained in:
Michael Meskes 2003-05-13 11:29:14 +00:00
parent 1c9ac7dfd0
commit 72f311b86a
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@ -1404,6 +1404,10 @@ Fri May 2 16:37:06 CEST 2003
Tue May 6 11:51:33 CEST 2003
- Added rfmtlong compatibility function.
Tue May 13 13:34:12 CEST 2003
- Fixed order of include search path.
- Set ecpg version to 2.12.0.
- Set ecpg library to 3.4.2.
- Set pgtypes library to 1.0.0

27
src/interfaces/ecpg/preproc/ecpg.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.68 2003/05/02 14:43:25 meskes Exp $ */
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.69 2003/05/13 11:29:14 meskes Exp $ */
/* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
/* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@ -61,12 +61,19 @@ help(const char *progname)
static void
add_include_path(char *path)
{
struct _include_path *ip = include_paths;
struct _include_path *ip = include_paths, *new;
include_paths = mm_alloc(sizeof(struct _include_path));
include_paths->path = path;
include_paths->next = ip;
new = mm_alloc(sizeof(struct _include_path));
new->path = path;
new->next = NULL;
if (ip == NULL)
include_paths = new;
else
{
for (;ip->next != NULL; ip=ip->next);
ip->next = new;
}
}
static void
@ -125,11 +132,6 @@ main(int argc, char *const argv[])
}
}
add_include_path("/usr/include");
add_include_path(INCLUDE_PATH);
add_include_path("/usr/local/include");
add_include_path(".");
while ((c = getopt(argc, argv, "vcio:I:tD:dC:")) != -1)
{
switch (c)
@ -187,6 +189,11 @@ main(int argc, char *const argv[])
}
}
add_include_path(".");
add_include_path("/usr/local/include");
add_include_path(INCLUDE_PATH);
add_include_path("/usr/include");
if (verbose)
{
fprintf(stderr, "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n",