Fix compile problem with Win32 macro used inside another macro.

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index c7f79df416dc80185f9d8924be3f4f533315f823..7b9d9c25a40fce50365c4385c96eb08b17f0f97f 100644 (file)
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * 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] != '$')
        return pstrdup(name);
 
-   macroname_len = strcspn(name + 1,
 #ifndef WIN32
-       "/"
+   macroname_len = strcspn(name + 1, "/") + 1;
 #else
-       "/\\"
+   macroname_len = strcspn(name + 1, "/\\") + 1;
 #endif
-       ) + 1;
 
    if (strncmp(name, "$libdir", macroname_len) == 0)
        replacement = PKGLIBDIR;