mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
Fix compile problem with Win32 macro used inside another macro.
This commit is contained in:
parent
d46e643822
commit
3a8f67d091
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.58 2003/04/04 20:42:12 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.59 2003/04/05 19:54:12 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -326,13 +326,11 @@ substitute_libpath_macro(const char *name)
|
|||||||
if (name[0] != '$')
|
if (name[0] != '$')
|
||||||
return pstrdup(name);
|
return pstrdup(name);
|
||||||
|
|
||||||
macroname_len = strcspn(name + 1,
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
"/"
|
macroname_len = strcspn(name + 1, "/") + 1;
|
||||||
#else
|
#else
|
||||||
"/\\"
|
macroname_len = strcspn(name + 1, "/\\") + 1;
|
||||||
#endif
|
#endif
|
||||||
) + 1;
|
|
||||||
|
|
||||||
if (strncmp(name, "$libdir", macroname_len) == 0)
|
if (strncmp(name, "$libdir", macroname_len) == 0)
|
||||||
replacement = PKGLIBDIR;
|
replacement = PKGLIBDIR;
|
||||||
|
Loading…
Reference in New Issue
Block a user