opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

No more warnings on macros, thanks VAdim.

This commit is contained in:
Bruce Momjian 1997-10-30 23:37:01 +00:00
parent fcb47f8884
commit 0308f91cd2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/access/heapam.h
View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: heapam.h,v 1.19 1997/09/14 03:59:44 momjian Exp $
* $Id: heapam.h,v 1.20 1997/10/30 23:37:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -101,10 +101,10 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
#define heap_getattr(tup, b, attnum, tupleDesc, isnull) \
(AssertMacro((tup) != NULL) ? \
((attnum) > (int) (tup)->t_natts) ? \
(((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \
(((isnull) ? (*(isnull) = true) : (void)NULL), (Datum)NULL) : \
((attnum) > 0) ? \
fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \
(((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \
(((isnull) ? (*(isnull) = false) : (void)NULL), heap_getsysattr((tup), (b), (attnum))) : \
(Datum)NULL)
extern HeapAccessStatistics heap_access_stats; /* in stats.c */

4
src/include/c.h
View File

@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: c.h,v 1.25 1997/10/27 12:07:10 vadim Exp $
* $Id: c.h,v 1.26 1997/10/30 23:36:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -691,7 +691,7 @@ typedef struct Exception
*/
/* we do this so if the macro is used in an if action, it will work */
#define StrNCpy(dst,src,len) \
(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : NULL,(void)(dst))
(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : (void)NULL,(void)(dst))
/* Get a bit mask of the bits set in non-int32 aligned addresses */
#define INT_ALIGN_MASK (sizeof(int32) - 1)