diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1999-08-02 05:25:27 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1999-08-02 05:25:27 +0000 |
| commit | 9a8aeb23a19ee6833480d4c12719d9fd26ad8571 (patch) | |
| tree | c97d5f26e89cc9d33c5be420a5e7688835644c77 /src/backend/utils/adt/arrayfuncs.c | |
| parent | 62d146bdcd784280b573acd8af52488e66e212cf (diff) | |
| download | postgresql-9a8aeb23a19ee6833480d4c12719d9fd26ad8571.tar.gz postgresql-9a8aeb23a19ee6833480d4c12719d9fd26ad8571.zip | |
Another 'mega-commit' of back-patches ...
- integrating the #include file cleanup that Bruce recently did
- got the CPU change to adt/Makefile
- changing DOUBLEALIGN -> MAXALIGN
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index b0e59e3ff08..fd01b17e19a 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,30 +7,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43 1999/05/25 16:11:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43.2.1 1999/08/02 05:24:49 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <ctype.h> -#include <stdio.h> -#include <string.h> -#include <stdarg.h> #include "postgres.h" + #include "catalog/catalog.h" #include "catalog/pg_type.h" - -#include "utils/syscache.h" -#include "utils/memutils.h" -#include "storage/fd.h" #include "fmgr.h" -#include "utils/array.h" -#include "utils/elog.h" - -#include "libpq/libpq-fs.h" #include "libpq/be-fsstubs.h" +#include "libpq/libpq-fs.h" +#include "storage/fd.h" +#include "utils/array.h" +#include "utils/memutils.h" +#include "utils/syscache.h" #define ASSGN "=" @@ -477,7 +472,7 @@ _ReadArrayStr(char *arrayStr, if (values[i]) { if (typalign == 'd') - *nbytes += DOUBLEALIGN(*(int32 *) values[i]); + *nbytes += MAXALIGN(*(int32 *) values[i]); else *nbytes += INTALIGN(*(int32 *) values[i]); } |