NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6c9b11b

committed

Fix for AIX compile and unsigned/signed typedefs.

Peter E, Tatsuo, Andreas

1 parenta6348ae commit6c9b11bCopy full SHA for 6c9b11b

File tree

3 files changed

+27

-8

lines changed

configure.in
src/include
- c.h
- pg_config.h.in

3 files changed

+27

-8

lines changed

`‎configure.in‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1169,6 +1169,12 @@ else`
`1169`	`1169`	`fi`
`1170`	`1170`	`AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any type])`
`1171`	`1171`
	`1172`	`+# Some platforms predefine the types int8, int16, etc. Only check`
	`1173`	`+# a (hopefully) representative subset. Don't use AC_CHECK_TYPE, which`
	`1174`	`+# doesn't work the way we want to.`
	`1175`	`+AC_CHECK_SIZEOF(int8, 0)`
	`1176`	`+AC_CHECK_SIZEOF(uint8, 0)`
	`1177`	`+`
`1172`	`1178`	`PGAC_FUNC_POSIX_SIGNALS`
`1173`	`1179`
`1174`	`1180`

`‎src/include/c.h‎`

Lines changed: 17 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $Id: c.h,v 1.109 2001/11/12 01:52:46 momjian Exp $`
	`15`	`+ * $Id: c.h,v 1.110 2001/11/15 16:09:34 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -205,11 +205,11 @@ typedef char *Pointer;`
`205`	`205`	`*used for numerical computations and the`
`206`	`206`	`*frontend/backend protocol.`
`207`	`207`	`*/`
`208`		`-#ifndef__BEOS__/* this shouldn't be required, but is is! */`
	`208`	`+#ifSIZEOF_INT8==0`
`209`	`209`	`typedefsignedcharint8;/* == 8 bits */`
`210`	`210`	`typedefsigned shortint16;/* == 16 bits */`
`211`	`211`	`typedefsignedintint32;/* == 32 bits */`
`212`		`-#endif/__BEOS__ /`
	`212`	`+#endif/SIZEOF_INT8 == 0 /`
`213`	`213`
`214`	`214`	`/*`
`215`	`215`	`* uintN`
`@@ -218,11 +218,11 @@ typedef signed int int32;/* == 32 bits */`
`218`	`218`	`*frontend/backend protocol.`
`219`	`219`	`*/`
`220`	`220`	`/* Also defined in interfaces/odbc/md5.h */`
`221`		`-#ifndef__BEOS__/* this shouldn't be required, but is is! */`
	`221`	`+#ifSIZEOF_UINT8==0`
`222`	`222`	`typedefunsignedcharuint8;/* == 8 bits */`
`223`	`223`	`typedefunsigned shortuint16;/* == 16 bits */`
`224`	`224`	`typedefunsignedintuint32;/* == 32 bits */`
`225`		`-#endif/__BEOS__ /`
	`225`	`+#endif/SIZEOF_UINT8 == 0 /`
`226`	`226`
`227`	`227`	`/*`
`228`	`228`	`* boolN`
`@@ -268,27 +268,37 @@ typedef double *float64;`
`268`	`268`	`/*`
`269`	`269`	`* 64-bit integers`
`270`	`270`	`*/`
`271`		`-#ifndef__BEOS__/* this is already defined on BeOS */`
`272`	`271`	`#ifdefHAVE_LONG_INT_64`
`273`	`272`	`/* Plain "long int" fits, use it */`
	`273`	`+#ifSIZEOF_INT8==0`
`274`	`274`	`typedeflongintint64;`
	`275`	`+#endif`
	`276`	`+#ifSIZEOF_UINT8==0`
`275`	`277`	`typedefunsigned longintuint64;`
	`278`	`+#endif`
`276`	`279`
`277`	`280`	`#else`
`278`	`281`	`#ifdefHAVE_LONG_LONG_INT_64`
`279`	`282`	`/* We have working support for "long long int", use that */`
	`283`	`+#ifSIZEOF_INT8==0`
`280`	`284`	`typedeflong longintint64;`
	`285`	`+#endif`
	`286`	`+#ifSIZEOF_UINT8==0`
`281`	`287`	`typedefunsigned long longintuint64;`
	`288`	`+#endif`
`282`	`289`
`283`	`290`	`#else`
`284`	`291`	`/* Won't actually work, but fall back to long int so that code compiles */`
	`292`	`+#ifSIZEOF_INT8==0`
`285`	`293`	`typedeflongintint64;`
	`294`	`+#endif`
	`295`	`+#ifSIZEOF_UINT8==0`
`286`	`296`	`typedefunsigned longintuint64;`
	`297`	`+#endif`
`287`	`298`
`288`	`299`	`#defineINT64_IS_BUSTED`
`289`	`300`	`#endif`
`290`	`301`	`#endif`
`291`		`-#endif/* __BEOS__ */`
`292`	`302`
`293`	`303`	`/*`
`294`	`304`	`* Size`

`‎src/include/pg_config.h.in‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your`
`9`	`9`	`* changes will be overwritten the next time you run configure.`
`10`	`10`	`*`
`11`		`- * $Id: pg_config.h.in,v 1.11 2001/10/20 17:57:39 tgl Exp $`
	`11`	`+ * $Id: pg_config.h.in,v 1.12 2001/11/15 16:09:34 momjian Exp $`
`12`	`12`	`*/`
`13`	`13`
`14`	`14`	`#ifndefPG_CONFIG_H`
`@@ -697,6 +697,9 @@ extern int fdatasync(int fildes);`
`697`	`697`	`/* Define if you have on_exit() */`
`698`	`698`	`#undef HAVE_ON_EXIT`
`699`	`699`
	`700`	`+#undef SIZEOF_INT8`
	`701`	`+#undef SIZEOF_UINT8`
	`702`	`+`
`700`	`703`	`/*`
`701`	`704`	`*------------------------------------------------------------------------`
`702`	`705`	`* Part 4: pull in system-specific declarations.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6c9b11b

File tree

3 files changed

3 files changed

`‎configure.in‎`

`‎src/include/c.h‎`

`‎src/include/pg_config.h.in‎`

0 commit comments