Commit9dac526

committed

Win32 adjustments for dirmod and configure/configure.in.

1 parent67aa196 commit9dac526Copy full SHA for 9dac526

File tree

+19

-6

lines changed

+19

-6

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12078,12 +12078,15 @@ esac`
`12078`	`12078`	`# Win32 can't to rename or unlink on an open file`
`12079`	`12079`	`case $host_os in mingw*)`
`12080`	`12080`	`LIBOBJS="$LIBOBJS copydir.$ac_objext"`
`12081`		`-LIBOBJS="$LIBOBJS dirmod.$ac_objext"`
`12082`	`12081`	`LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"`
`12083`	`12082`	`LIBOBJS="$LIBOBJS pipe.$ac_objext"`
`12084`	`12083`	`LIBOBJS="$LIBOBJS rand.$ac_objext" ;;`
`12085`	`12084`	`esac`
`12086`	`12085`
	`12086`	`+case $host_os in mingw\|cygwin)`
	`12087`	`+LIBOBJS="$LIBOBJS dirmod.$ac_objext" ;;`
	`12088`	`+esac`
	`12089`	`+`
`12087`	`12090`	`if test "$with_readline" = yes; then`
`12088`	`12091`	`echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5`
`12089`	`12092`	`echo $ECHO_N "checking for rl_completion_append_character... $ECHO_C" >&6`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.312 2004/02/0216:00:49 momjian Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.313 2004/02/0222:20:32 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -906,12 +906,15 @@ esac`
`906`	`906`	`# Win32 can't to rename or unlink on an open file`
`907`	`907`	`case $host_os in mingw*)`
`908`	`908`	`AC_LIBOBJ(copydir)`
`909`		`-AC_LIBOBJ(dirmod)`
`910`	`909`	`AC_LIBOBJ(gettimeofday)`
`911`	`910`	`AC_LIBOBJ(pipe)`
`912`	`911`	`AC_LIBOBJ(rand) ;;`
`913`	`912`	`esac`
`914`	`913`
	`914`	`+case $host_os in mingw\|cygwin)`
	`915`	`+AC_LIBOBJ(dirmod) ;;`
	`916`	`+esac`
	`917`	`+`
`915`	`918`	`if test "$with_readline" = yes; then`
`916`	`919`	`PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER`
`917`	`920`	`AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.17 2004/02/0200:17:23 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.18 2004/02/0222:20:33 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -30,7 +30,7 @@ extern intfseeko(FILE *stream, off_t offset, int whence);`
`30`	`30`	`externoff_tftello(FILE*stream);`
`31`	`31`	`#endif`
`32`	`32`
`33`		`-#if!defined(FRONTEND)&& (defined(WIN32)\|\| defined(CYGWIN))`
	`33`	`+#if defined(WIN32)\|\| defined(CYGWIN)`
`34`	`34`	`/*`
`35`	`35`	`* Win32 doesn't have reliable rename/unlink during concurrent access`
`36`	`36`	`*/`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,20 @@`
`10`	`10`	`*Win32 (NT, Win2k, XP).replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.9 2004/02/0200:17:23 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.10 2004/02/0222:20:33 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`#ifndefTEST_VERSION`
`19`	`19`
	`20`	`+#if defined(WIN32)\|\| defined(CYGWIN)`
	`21`	`+`
	`22`	`+#ifndefFRONTEND`
`20`	`23`	`#include"postgres.h"`
	`24`	`+#else`
	`25`	`+#include"postgres_fe.h"`
	`26`	`+#endif`
`21`	`27`
`22`	`28`	`#undef rename`
`23`	`29`	`#undef unlink`
`@@ -95,6 +101,7 @@ pgunlink(const char *path)`
`95`	`101`	`return0;`
`96`	`102`	`}`
`97`	`103`
	`104`	`+#endif`
`98`	`105`
`99`	`106`	`#else`
`100`	`107`

Comments

(0)