Commit3929b6e

committed

Move "#define inline __inline" from port/win32.h to c.h because Win32

interface builds like libpq need it.Backpatch addition to 8.1.X.

1 parenta4f14fd commit3929b6eCopy full SHA for 3929b6e

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $PostgreSQL: pgsql/src/include/c.h,v 1.209 2006/08/08 18:49:14 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.210 2006/08/10 01:35:21 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -744,6 +744,17 @@ typedef NameData *Name;`
`744`	`744`	`#definePG_BINARY_W "w"`
`745`	`745`	`#endif`
`746`	`746`
	`747`	`+#ifdefMSVC`
	`748`	`+/*`
	`749`	`+ *Certain "standard edition" versions of MSVC throw a warning`
	`750`	`+ *that later generates an error for "inline" statements, but`
	`751`	`+ *__inline seems to work. e.g. Microsoft Visual C++ .NET`
	`752`	`+ *Version 7.1.3088`
	`753`	`+ */`
	`754`	`+#defineinline __inline`
	`755`	`+#define__inline__ __inline`
	`756`	`+#endif`
	`757`	`+`
`747`	`758`	`#if defined(sun)&& defined(__sparc__)&& !defined(__SVR4)`
`748`	`759`	`#include<unistd.h>`
`749`	`760`	`#endif`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.56 2006/08/09 17:33:52 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.57 2006/08/10 01:35:21 momjian Exp $ */`
`2`	`2`
`3`	`3`	`/* undefine and redefine after #include */`
`4`	`4`	`#undef mkdir`
`@@ -259,9 +259,6 @@ extern void _dosmaperr(unsigned long);`
`259`	`259`	`typedeflongssize_t;`
`260`	`260`	`typedefunsigned shortmode_t;`
`261`	`261`
`262`		`-#defineinline __inline`
`263`		`-#define__inline__ __inline`
`264`		`-`
`265`	`262`	`#undef errcode`
`266`	`263`	`#defineerrcode __vc_errcode`
`267`	`264`

Comments

(0)