From 3a8f67d0916586a9c6087b240878965d65b19cbb Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 5 Apr 2003 19:54:12 +0000
Subject: [PATCH] Fix compile problem with Win32 macro used inside another
 macro.

---
 src/backend/utils/fmgr/dfmgr.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index c7f79df416..7b9d9c25a4 100644
--- 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;