Commite860e74

committed

Return inline to win32.h because code was OK, but keep additional

comment. 8.1.X is not affected by this commit.

1 parent3929b6e commite860e74Copy full SHA for e860e74

File tree

+11

-13

lines changed

+11

-13

lines changed

Lines changed: 1 addition & 12 deletions

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.210 2006/08/10 01:35:21 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.211 2006/08/10 01:41:29 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -744,17 +744,6 @@ 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`		`-`
`758`	`747`	`#if defined(sun)&& defined(__sparc__)&& !defined(__SVR4)`
`759`	`748`	`#include<unistd.h>`
`760`	`749`	`#endif`

Lines changed: 10 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.57 2006/08/10 01:35:21 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.58 2006/08/10 01:41:29 momjian Exp $ */`
`2`	`2`
`3`	`3`	`/* undefine and redefine after #include */`
`4`	`4`	`#undef mkdir`
`@@ -259,6 +259,15 @@ extern void _dosmaperr(unsigned long);`
`259`	`259`	`typedeflongssize_t;`
`260`	`260`	`typedefunsigned shortmode_t;`
`261`	`261`
	`262`	`+/*`
	`263`	`+ *Certain "standard edition" versions of MSVC throw a warning`
	`264`	`+ *that later generates an error for "inline" statements, but`
	`265`	`+ *__inline seems to work. e.g. Microsoft Visual C++ .NET`
	`266`	`+ *Version 7.1.3088`
	`267`	`+ */`
	`268`	`+#defineinline __inline`
	`269`	`+#define__inline__ __inline`
	`270`	`+`
`262`	`271`	`#undef errcode`
`263`	`272`	`#defineerrcode __vc_errcode`
`264`	`273`

Comments

(0)