NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commiteeec317

committed

Determines the PKGLIBDIR equivalent under win32. Requires pgsql lib and

bin directories to be packaged under the same root directory (eg. <somepath>/pgsql/bin and <some path>/pgsql/lib) for the win32 port, whichdoes not appear to be an onerous restriction.Claudio Natoli

1 parent943eae9 commiteeec317Copy full SHA for eeec317

File tree

1 file changed

+23

-1

lines changed

src/backend/utils/fmgr
- dfmgr.c

1 file changed

+23

-1

lines changed

`‎src/backend/utils/fmgr/dfmgr.c`

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.70 2004/02/17 03:35:57 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.71 2004/03/09 05:06:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -343,6 +343,9 @@ substitute_libpath_macro(const char *name)`
`343`	`343`	`{`
`344`	`344`	`size_tmacroname_len;`
`345`	`345`	`char*replacement=NULL;`
	`346`	`+#ifdefWIN32`
	`347`	`+charbasename[MAXPGPATH];`
	`348`	`+#endif`
`346`	`349`
`347`	`350`	`AssertArg(name!=NULL);`
`348`	`351`
`@@ -356,7 +359,26 @@ substitute_libpath_macro(const char *name)`
`356`	`359`	`#endif`
`357`	`360`
`358`	`361`	`if (strncmp(name,"$libdir",macroname_len)==0)`
	`362`	`+#ifndefWIN32`
`359`	`363`	`replacement=PKGLIBDIR;`
	`364`	`+#else`
	`365`	`+{`
	`366`	`+char*p;`
	`367`	`+if (GetModuleFileName(NULL,basename,MAXPGPATH)==0)`
	`368`	`+ereport(FATAL,`
	`369`	`+(errmsg("GetModuleFileName failed (%i)",(int)GetLastError())));`
	`370`	`+`
	`371`	`+canonicalize_path(basename);`
	`372`	`+if ((p=last_path_separator(basename))==NULL)`
	`373`	`+ereport(FATAL,`
	`374`	`+(errmsg("unexpected failure in determining PKGLIBDIR (%s)",basename)));`
	`375`	`+else`
	`376`	`+*p='\0';`
	`377`	`+`
	`378`	`+strcat(basename,"/../lib");`
	`379`	`+replacement=basename;`
	`380`	`+}`
	`381`	`+#endif`
`360`	`382`	`else`
`361`	`383`	`ereport(ERROR,`
`362`	`384`	`(errcode(ERRCODE_INVALID_NAME),`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteeec317

File tree

1 file changed

1 file changed

`‎src/backend/utils/fmgr/dfmgr.c`

0 commit comments