Commitd00a347

committed

Update MinGW so it handles fseeko() similar to Unix.

1 parent7e518a3 commitd00a347Copy full SHA for d00a347

File tree

+24

-25

lines changed

+24

-25

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18999,7 +18999,8 @@ done`
`18999`	`18999`
`19000`	`19000`	`case $host_os in`
`19001`	`19001`	`# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos`
`19002`		`-bsdi\|netbsd)`
	`19002`	`+# Mingw uses macros to access Win32 API calls`
	`19003`	`+bsdi\|netbsd\|mingw*)`
`19003`	`19004`
`19004`	`19005`	`cat >>confdefs.h <<\_ACEOF`
`19005`	`19006`	`#define HAVE_FSEEKO 1`

Lines changed: 3 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.582 2009/01/06 17:27:06 tgl Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.583 2009/01/07 03:39:33 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1319,7 +1319,8 @@ AC_CHECK_FUNCS(atexit, [],`
`1319`	`1319`	`AC_REPLACE_FUNCS(fseeko)`
`1320`	`1320`	`case $host_os in`
`1321`	`1321`	`# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos`
`1322`		`-bsdi\|netbsd)`
	`1322`	`+# Mingw uses macros to access Win32 API calls`
	`1323`	`+bsdi\|netbsd\|mingw*)`
`1323`	`1324`	`AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.])`
`1324`	`1325`	`ac_cv_func_fseeko=yes;;`
`1325`	`1326`	`*)`

Lines changed: 1 addition & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.145 2009/01/01 17:23:54 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.146 2009/01/07 03:39:33 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -16,25 +16,6 @@`
`16`	`16`
`17`	`17`	`#include"postgres_fe.h"`
`18`	`18`
`19`		`-/*`
`20`		`- * WIN32 does not provide 64-bit off_t, but does provide the functions operating`
`21`		`- * with 64-bit offsets.`
`22`		`- */`
`23`		`-#ifdefWIN32`
`24`		`-#definepgoff_t __int64`
`25`		`-#undef fseeko`
`26`		`-#undef ftello`
`27`		`-#ifdefWIN32_ONLY_COMPILER`
`28`		`-#definefseeko(stream,offset,origin) _fseeki64(stream, offset, origin)`
`29`		`-#defineftello(stream) _ftelli64(stream)`
`30`		`-#else`
`31`		`-#definefseeko(stream,offset,origin) fseeko64(stream, offset, origin)`
`32`		`-#defineftello(stream) ftello64(stream)`
`33`		`-#endif`
`34`		`-#else`
`35`		`-#definepgoff_t off_t`
`36`		`-#endif`
`37`		`-`
`38`	`19`	`/*`
`39`	`20`	`* pg_dump uses two different mechanisms for identifying database objects:`
`40`	`21`	`*`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2009, 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.123 2009/01/01 17:23:55 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.124 2009/01/07 03:39:33 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -341,10 +341,14 @@ extern intgettimeofday(struct timeval * tp, struct timezone * tzp);`
`341`	`341`	`externcharcrypt(constcharkey,constchar*setting);`
`342`	`342`	`#endif`
`343`	`343`
	`344`	`+/* WIN32 handled in port/win32.h */`
	`345`	`+#ifndefWIN32`
	`346`	`+#definepgoff_t off_t`
`344`	`347`	`#if defined(bsdi)\|\| defined(netbsd)`
`345`	`348`	`externintfseeko(FILE*stream,off_toffset,intwhence);`
`346`	`349`	`externoff_tftello(FILE*stream);`
`347`	`350`	`#endif`
	`351`	`+#endif`
`348`	`352`
`349`	`353`	`#ifndefHAVE_FSEEKO`
`350`	`354`	`#definefseeko(a,b,c) fseek(a, b, c)`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.84 2008/02/17 02:09:31 tgl Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.85 2009/01/07 03:39:33 momjian Exp $ */`
`2`	`2`
`3`	`3`	`#if defined(_MSC_VER)\|\| defined(__BORLANDC__)`
`4`	`4`	`#defineWIN32_ONLY_COMPILER`
`@@ -190,6 +190,18 @@ struct itimerval`
`190`	`190`
`191`	`191`	`intsetitimer(intwhich,conststructitimervalvalue,structitimervalovalue);`
`192`	`192`
	`193`	`+/*`
	`194`	`+ * WIN32 does not provide 64-bit off_t, but does provide the functions operating`
	`195`	`+ * with 64-bit offsets.`
	`196`	`+ */`
	`197`	`+#definepgoff_t __int64`
	`198`	`+#ifdefWIN32_ONLY_COMPILER`
	`199`	`+#definefseeko(stream,offset,origin) _fseeki64(stream, offset, origin)`
	`200`	`+#defineftello(stream) _ftelli64(stream)`
	`201`	`+#else`
	`202`	`+#definefseeko(stream,offset,origin) fseeko64(stream, offset, origin)`
	`203`	`+#defineftello(stream) ftello64(stream)`
	`204`	`+#endif`
`193`	`205`
`194`	`206`	`/*`
`195`	`207`	`* Supplement to <sys/types.h>.`

Comments

(0)