Commit0308f91

committed

No more warnings on macros, thanks VAdim.

1 parentfcb47f8 commit0308f91Copy full SHA for 0308f91

File tree

-5

lines changed

-5

lines changed

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: heapam.h,v 1.19 1997/09/14 03:59:44 momjian Exp $`
	`9`	`+ * $Id: heapam.h,v 1.20 1997/10/30 23:37:01 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -101,10 +101,10 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;`
`101`	`101`	`#defineheap_getattr(tup,b,attnum,tupleDesc,isnull) \`
`102`	`102`	`(AssertMacro((tup) != NULL) ? \`
`103`	`103`	`((attnum) > (int) (tup)->t_natts) ? \`
`104`		`-(((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \`
	`104`	`+(((isnull) ? (*(isnull) = true) : (void)NULL), (Datum)NULL) : \`
`105`	`105`	`((attnum) > 0) ? \`
`106`	`106`	`fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \`
`107`		`-(((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \`
	`107`	`+(((isnull) ? (*(isnull) = false) : (void)NULL), heap_getsysattr((tup), (b), (attnum))) : \`
`108`	`108`	`(Datum)NULL)`
`109`	`109`
`110`	`110`	`externHeapAccessStatisticsheap_access_stats;/* in stats.c */`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: c.h,v 1.25 1997/10/27 12:07:10 vadim Exp $`
	`10`	`+ * $Id: c.h,v 1.26 1997/10/30 23:36:56 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -691,7 +691,7 @@ typedef struct Exception`
`691`	`691`	`*/`
`692`	`692`	`/* we do this so if the macro is used in an if action, it will work */`
`693`	`693`	`#defineStrNCpy(dst,src,len)\`
`694`		`-(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : NULL,(void)(dst))`
	`694`	`+(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' :(void)NULL,(void)(dst))`
`695`	`695`
`696`	`696`	`/* Get a bit mask of the bits set in non-int32 aligned addresses */`
`697`	`697`	`#defineINT_ALIGN_MASK (sizeof(int32) - 1)`

Comments

(0)