diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/miscadmin.h | 3 | ||||
-rw-r--r-- | src/include/port.h | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 09f2cf2aa24..a97caf0fac2 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.158 2004/05/13 22:45:04 momjian Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.159 2004/05/17 14:35:33 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -143,6 +143,7 @@ extern long MyCancelKey; extern char OutputFileName[]; extern char my_exec_path[]; +extern char pkglib_path[]; /* * done in storage/backendid.h for now. diff --git a/src/include/port.h b/src/include/port.h index ca184bd98c9..ea64dd61790 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.31 2004/05/14 17:04:47 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.32 2004/05/17 14:35:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,12 +26,17 @@ extern char *first_path_separator(const char *filename); extern char *last_path_separator(const char *filename); extern void canonicalize_path(char *path); extern const char *get_progname(const char *argv0); +extern void get_share_path(const char *my_exec_path, char *ret_path); +extern void get_etc_path(const char *my_exec_path, char *ret_path); +extern void get_include_path(const char *my_exec_path, char *ret_path); +extern void get_pkginclude_path(const char *my_exec_path, char *ret_path); +extern void get_pkglib_path(const char *my_exec_path, char *ret_path); + /* Portable way to find binaries */ extern int find_my_exec(const char *argv0, char *full_path); extern int find_other_exec(const char *argv0, char const *target, const char *versionstr, char *retpath); - #if defined(__CYGWIN__) || defined(WIN32) #define EXE ".exe" #define DEVNULL "nul" @@ -180,13 +185,6 @@ extern int pqGethostbyname(const char *name, struct hostent **result, int *herrno); -/* $PATH (or %PATH%) path separator */ -#ifdef WIN32 -#define PATHSEP ';' -#else -#define PATHSEP ':' -#endif - /* FIXME: [win32] Placeholder win32 replacements, to allow continued development */ #ifdef WIN32 #define fsync(a) _commit(a) |