Add cygwin version check before using cygwin_conv_path(),

ItGacky · ItGacky · commit 1a8957a6f7f1 · 2010-04-07T03:48:51.000Z
and use cygwin_conv_to_full_win32_path() in older versions.
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.121 2010/04/05 02:25:56 itagaki Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.122 2010/04/07 03:48:51 itagaki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1080,7 +1080,11 @@ pgwin32_CommandLine(bool registration)
 
 #ifdef __CYGWIN__
 	/* need to convert to windows path */
+#if CYGWIN_VERSION_DLL_MAJOR >= 1007
 	cygwin_conv_path(CCP_POSIX_TO_WIN_A, cmdLine, buf, sizeof(buf));
+#else
+	cygwin_conv_to_full_win32_path(cmdLine, buf);
+#endif
 	strcpy(cmdLine, buf);
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.121 2010/04/05 02:25:56 itagaki Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.122 2010/04/07 03:48:51 itagaki Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -1080,7 +1080,11 @@ pgwin32_CommandLine(bool registration)`
`1080`	`1080`
`1081`	`1081`	`#ifdef __CYGWIN__`
`1082`	`1082`	`/* need to convert to windows path */`
	`1083`	`+#if CYGWIN_VERSION_DLL_MAJOR >= 1007`
`1083`	`1084`	`cygwin_conv_path(CCP_POSIX_TO_WIN_A, cmdLine, buf, sizeof(buf));`
	`1085`	`+#else`
	`1086`	`+ cygwin_conv_to_full_win32_path(cmdLine, buf);`
	`1087`	`+#endif`
`1084`	`1088`	`strcpy(cmdLine, buf);`
`1085`	`1089`	`#endif`
`1086`	`1090`