1212 * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
1313 * Portions Copyright (c) 1994, Regents of the University of California
1414 *
15- * $PostgreSQL: pgsql/src/include/c.h,v 1.195 2006/02/03 13:53:15 momjian Exp $
15+ * $PostgreSQL: pgsql/src/include/c.h,v 1.196 2006/02/16 23:23:50 petere Exp $
1616 *
1717 *-------------------------------------------------------------------------
1818 */
@@ -603,8 +603,8 @@ typedef NameData *Name;
603603} while (0)
604604
605605
606- /* Get a bit mask of the bits set in non-int32 aligned addresses */
607- #define INT_ALIGN_MASK (sizeof(int32 ) - 1)
606+ /* Get a bit mask of the bits set in non-long aligned addresses */
607+ #define LONG_ALIGN_MASK (sizeof(long ) - 1)
608608
609609/*
610610 * MemSet
@@ -624,8 +624,8 @@ typedef NameData *Name;
624624int _val = (val ); \
625625Size _len = (len ); \
626626\
627- if ((((long )_vstart )& INT_ALIGN_MASK )== 0 && \
628- (_len & INT_ALIGN_MASK )== 0 && \
627+ if ((((long )_vstart )& LONG_ALIGN_MASK )== 0 && \
628+ (_len & LONG_ALIGN_MASK )== 0 && \
629629_val == 0 && \
630630_len <=MEMSET_LOOP_LIMIT && \
631631/* \
@@ -634,8 +634,8 @@ typedef NameData *Name;
634634 */ \
635635MEMSET_LOOP_LIMIT != 0 ) \
636636{ \
637- int32 * _start = (int32 * )_vstart ; \
638- int32 * _stop = (int32 * ) ((char * )_start + _len ); \
637+ long * _start = (long * )_vstart ; \
638+ long * _stop = (long * ) ((char * )_start + _len ); \
639639while (_start < _stop ) \
640640* _start ++ = 0 ; \
641641} \
@@ -652,16 +652,16 @@ typedef NameData *Name;
652652#define MemSetAligned (start ,val ,len ) \
653653do \
654654{ \
655- int32 *_start = (int32 *) (start); \
655+ long *_start = (long *) (start); \
656656int_val = (val); \
657657Size_len = (len); \
658658\
659- if ((_len &INT_ALIGN_MASK ) == 0 && \
659+ if ((_len &LONG_ALIGN_MASK ) == 0 && \
660660_val == 0 && \
661661_len <= MEMSET_LOOP_LIMIT && \
662662MEMSET_LOOP_LIMIT != 0) \
663663{ \
664- int32 *_stop = (int32 *) ((char *) _start + _len); \
664+ long *_stop = (long *) ((char *) _start + _len); \
665665while (_start < _stop) \
666666*_start++ = 0; \
667667} \
@@ -679,16 +679,16 @@ typedef NameData *Name;
679679 * this approach.
680680 */
681681#define MemSetTest (val ,len ) \
682- ( ((len) &INT_ALIGN_MASK ) == 0 && \
682+ ( ((len) &LONG_ALIGN_MASK ) == 0 && \
683683(len) <= MEMSET_LOOP_LIMIT && \
684684MEMSET_LOOP_LIMIT != 0 && \
685685(val) == 0 )
686686
687687#define MemSetLoop (start ,val ,len ) \
688688do \
689689{ \
690- int32 * _start = (int32 *) (start); \
691- int32 * _stop = (int32 *) ((char *) _start + (Size) (len)); \
690+ long * _start = (long *) (start); \
691+ long * _stop = (long *) ((char *) _start + (Size) (len)); \
692692\
693693while (_start < _stop) \
694694*_start++ = 0; \