Commitfeb5a2c

committed

Fix for various aix related 'mis-defines'

From: Darren King <darrenk@insightdist.com>

1 parentea514d2 commitfeb5a2cCopy full SHA for feb5a2c

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.21 1998/01/26 01:01:37 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.22 1998/02/03 02:08:58 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -141,7 +141,7 @@ static inttas(slock_t *lock);`
`141`	`141`	`* (see storage/ipc.h).`
`142`	`142`	`*/`
`143`	`143`
`144`		`-#if defined(aix)`
	`144`	`+#if defined(__AIX)`
`145`	`145`
`146`	`146`	`#defineS_LOCK(lock)do \`
`147`	`147`	`{ \`
`@@ -153,7 +153,7 @@ static inttas(slock_t *lock);`
`153`	`153`
`154`	`154`	`#defineS_INIT_LOCK(lock)S_UNLOCK(lock)`
`155`	`155`
`156`		`-#endif/aix /`
	`156`	`+#endif/__AIX /`
`157`	`157`
`158`	`158`	`/*`
`159`	`159`	`* HP-UX (PA-RISC)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $Id: dt.h,v 1.25 1998/01/24 22:50:39 momjian Exp $`
	`11`	`+ * $Id: dt.h,v 1.26 1998/02/03 02:09:02 scrappy Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -187,11 +187,11 @@ typedef struct`
`187`	`187`	`/* keep this struct small; it gets used a lot */`
`188`	`188`	`typedefstruct`
`189`	`189`	`{`
`190`		`-#if defined(aix)`
	`190`	`+#if defined(__AIX)`
`191`	`191`	`char*token;`
`192`	`192`	`#else`
`193`	`193`	`chartoken[TOKMAXLEN];`
`194`		`-#endif/aix /`
	`194`	`+#endif/__AIX /`
`195`	`195`	`chartype;`
`196`	`196`	`charvalue;/* this may be unsigned, alas */`
`197`	`197`	`}datetkn;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nabstime.h,v 1.13 1997/09/08 21:55:13 momjian Exp $`
	`9`	`+ * $Id: nabstime.h,v 1.14 1998/02/03 02:09:08 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -53,7 +53,7 @@ typedef TimeIntervalData *TimeInterval;`
`53`	`53`	`#defineBIG_ABSTIME((AbsoluteTime) 0x7FFFFFFB)/* 2147483644 == 2^31 -`
`54`	`54`	`* 4 */`
`55`	`55`
`56`		`-#if defined(aix)`
	`56`	`+#if defined(__AIX)`
`57`	`57`	`/*`
`58`	`58`	`* AIX considers 2147483648 == -2147483648 (since they have the same bit`
`59`	`59`	`* representation) but uses a different sign sense in a comparison to`
`@@ -63,7 +63,7 @@ typedef TimeIntervalData *TimeInterval;`
`63`	`63`	`#defineNOSTART_ABSTIME ((AbsoluteTime) INT_MIN)`
`64`	`64`	`#else`
`65`	`65`	`#defineNOSTART_ABSTIME ((AbsoluteTime) 0x80000001)/* -2147483647 == - 2^31 */`
`66`		`-#endif/aix /`
	`66`	`+#endif/__AIX /`
`67`	`67`
`68`	`68`	`#defineINVALID_RELTIME ((RelativeTime) 0x7FFFFFFE)/* 2147483647 == 2^31 -`
`69`	`69`	`* 1 */`

Comments

(0)