From d51368dbbdde9cc11299426ec199c142f0a2e062 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 11 Oct 2003 16:30:55 +0000 Subject: [PATCH] This patch will stop gcc from issuing warnings about type-punned objects when -fstrict-aliasing is turned on, as it is in the latest gcc when you use -O2 Andrew Dunstan --- src/backend/commands/tablecmds.c | 4 ++-- src/backend/executor/execQual.c | 6 +++--- src/backend/port/sysv_shmem.c | 4 ++-- src/backend/storage/lmgr/proc.c | 8 ++++---- src/bin/psql/command.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 395077081a..d5c7ac27f2 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.86 2003/10/06 16:38:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.87 2003/10/11 16:30:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -3525,7 +3525,7 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint, trigdata.tg_newtuple = NULL; trigdata.tg_trigger = &trig; - fcinfo.context = (Node *) &trigdata; + fcinfo.context = (void *) &trigdata; RI_FKey_check_ins(&fcinfo); } diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 74560b1ba1..8a963f88cb 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.146 2003/09/25 23:02:11 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.147 2003/10/11 16:30:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -746,7 +746,7 @@ ExecMakeFunctionResult(FuncExprState *fcache, */ if (fcache->func.fn_retset) { - fcinfo.resultinfo = (Node *) &rsinfo; + fcinfo.resultinfo = (void *) &rsinfo; rsinfo.type = T_ReturnSetInfo; rsinfo.econtext = econtext; rsinfo.expectedDesc = NULL; @@ -992,7 +992,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr, * doesn't actually get to see the resultinfo, but set it up anyway * because we use some of the fields as our own state variables. */ - fcinfo.resultinfo = (Node *) &rsinfo; + fcinfo.resultinfo = (void *) &rsinfo; rsinfo.type = T_ReturnSetInfo; rsinfo.econtext = econtext; rsinfo.expectedDesc = expectedDesc; diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index e72818b11d..c7fff5bb7b 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.17 2003/09/29 00:05:25 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.18 2003/10/11 16:30:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -365,7 +365,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid) if (hdr->magic != PGShmemMagic) { - shmdt(hdr); + shmdt((void *) hdr); return NULL; /* segment belongs to a non-Postgres app */ } diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 8f5ab68dc0..5c0eb76935 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.133 2003/08/04 02:40:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.134 2003/10/11 16:30:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1013,7 +1013,7 @@ enable_sig_alarm(int delayms, bool is_statement_timeout) /* If we reach here, okay to set the timer interrupt */ #ifndef __BEOS__ - MemSet(&timeval, 0, sizeof(struct itimerval)); + MemSet((void *)&timeval, 0, sizeof(struct itimerval)); timeval.it_value.tv_sec = delayms / 1000; timeval.it_value.tv_usec = (delayms % 1000) * 1000; if (setitimer(ITIMER_REAL, &timeval, NULL)) @@ -1054,7 +1054,7 @@ disable_sig_alarm(bool is_statement_timeout) #ifndef __BEOS__ struct itimerval timeval; - MemSet(&timeval, 0, sizeof(struct itimerval)); + MemSet((void *)&timeval, 0, sizeof(struct itimerval)); if (setitimer(ITIMER_REAL, &timeval, NULL)) { statement_timeout_active = deadlock_timeout_active = false; @@ -1120,7 +1120,7 @@ CheckStatementTimeout(void) #ifndef __BEOS__ struct itimerval timeval; - MemSet(&timeval, 0, sizeof(struct itimerval)); + MemSet((void *)&timeval, 0, sizeof(struct itimerval)); timeval.it_value.tv_sec = statement_fin_time.tv_sec - now.tv_sec; timeval.it_value.tv_usec = statement_fin_time.tv_usec - now.tv_usec; if (timeval.it_value.tv_usec < 0) diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index ce5379e4f6..87ae1dc7c6 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.103 2003/09/29 16:39:18 petere Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.104 2003/10/11 16:30:55 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -1280,7 +1280,7 @@ unescape(const unsigned char *source, size_t len) case '7': case '8': case '9': - c = parse_char((char **) &p); + c = parse_char((void *) &p); break; default: