Commit3a8f67d

committed

Fix compile problem with Win32 macro used inside another macro.

1 parentd46e643 commit3a8f67dCopy full SHA for 3a8f67d

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.58 2003/04/04 20:42:12 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.59 2003/04/05 19:54:12 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -326,13 +326,11 @@ substitute_libpath_macro(const char *name)`
`326`	`326`	`if (name[0]!='$')`
`327`	`327`	`returnpstrdup(name);`
`328`	`328`
`329`		`-macroname_len=strcspn(name+1,`
`330`	`329`	`#ifndefWIN32`
`331`		`-"/"`
	`330`	`+macroname_len=strcspn(name+1,"/")+1;`
`332`	`331`	`#else`
`333`		`-"/\\"`
	`332`	`+macroname_len=strcspn(name+1,"/\\")+1;`
`334`	`333`	`#endif`
`335`		`-)+1;`
`336`	`334`
`337`	`335`	`if (strncmp(name,"$libdir",macroname_len)==0)`
`338`	`336`	`replacement=PKGLIBDIR;`

Comments

(0)