diff options
| -rw-r--r-- | src/include/c.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/include/c.h b/src/include/c.h index 4567e2102d5..7752e1ae02d 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.187 2005/07/02 17:01:52 momjian Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.188 2005/07/18 15:53:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -630,21 +630,22 @@ typedef NameData *Name; #define MemSet(start, val, len) \ do \ { \ - int32 *_start = (int32 *) (start); \ + void *_vstart = (void *) (start); \ int _val = (val); \ Size _len = (len); \ \ - if ((((long) _start) & INT_ALIGN_MASK) == 0 && \ + if ((((long) _vstart) & INT_ALIGN_MASK) == 0 && \ (_len & INT_ALIGN_MASK) == 0 && \ _val == 0 && \ _len <= MEMSET_LOOP_LIMIT) \ { \ + int32 *_start = (int32 *) _vstart; \ int32 *_stop = (int32 *) ((char *) _start + _len); \ while (_start < _stop) \ *_start++ = 0; \ } \ else \ - memset(_start, _val, _len); \ + memset(_vstart, _val, _len); \ } while (0) #define MEMSET_LOOP_LIMIT 1024 |