Commit 7fb9893f authored by Bruce Momjian's avatar Bruce Momjian

Back out -fstrict-aliasing void* casting.

parent 47ed4344
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.87 2003/10/11 16:30:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.88 2003/10/11 18:04:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -3525,7 +3525,7 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint, ...@@ -3525,7 +3525,7 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint,
trigdata.tg_newtuple = NULL; trigdata.tg_newtuple = NULL;
trigdata.tg_trigger = &trig; trigdata.tg_trigger = &trig;
fcinfo.context = (void *) &trigdata; fcinfo.context = (Node *) &trigdata;
RI_FKey_check_ins(&fcinfo); RI_FKey_check_ins(&fcinfo);
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.147 2003/10/11 16:30:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.148 2003/10/11 18:04:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -746,7 +746,7 @@ ExecMakeFunctionResult(FuncExprState *fcache, ...@@ -746,7 +746,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
*/ */
if (fcache->func.fn_retset) if (fcache->func.fn_retset)
{ {
fcinfo.resultinfo = (void *) &rsinfo; fcinfo.resultinfo = (Node *) &rsinfo;
rsinfo.type = T_ReturnSetInfo; rsinfo.type = T_ReturnSetInfo;
rsinfo.econtext = econtext; rsinfo.econtext = econtext;
rsinfo.expectedDesc = NULL; rsinfo.expectedDesc = NULL;
...@@ -992,7 +992,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr, ...@@ -992,7 +992,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
* doesn't actually get to see the resultinfo, but set it up anyway * 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. * because we use some of the fields as our own state variables.
*/ */
fcinfo.resultinfo = (void *) &rsinfo; fcinfo.resultinfo = (Node *) &rsinfo;
rsinfo.type = T_ReturnSetInfo; rsinfo.type = T_ReturnSetInfo;
rsinfo.econtext = econtext; rsinfo.econtext = econtext;
rsinfo.expectedDesc = expectedDesc; rsinfo.expectedDesc = expectedDesc;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.18 2003/10/11 16:30:55 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.19 2003/10/11 18:04:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -365,7 +365,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid) ...@@ -365,7 +365,7 @@ PGSharedMemoryAttach(IpcMemoryKey key, IpcMemoryId *shmid)
if (hdr->magic != PGShmemMagic) if (hdr->magic != PGShmemMagic)
{ {
shmdt((void *) hdr); shmdt(hdr);
return NULL; /* segment belongs to a non-Postgres app */ return NULL; /* segment belongs to a non-Postgres app */
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.134 2003/10/11 16:30:55 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.135 2003/10/11 18:04:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1013,7 +1013,7 @@ enable_sig_alarm(int delayms, bool is_statement_timeout) ...@@ -1013,7 +1013,7 @@ enable_sig_alarm(int delayms, bool is_statement_timeout)
/* If we reach here, okay to set the timer interrupt */ /* If we reach here, okay to set the timer interrupt */
#ifndef __BEOS__ #ifndef __BEOS__
MemSet((void *)&timeval, 0, sizeof(struct itimerval)); MemSet(&timeval, 0, sizeof(struct itimerval));
timeval.it_value.tv_sec = delayms / 1000; timeval.it_value.tv_sec = delayms / 1000;
timeval.it_value.tv_usec = (delayms % 1000) * 1000; timeval.it_value.tv_usec = (delayms % 1000) * 1000;
if (setitimer(ITIMER_REAL, &timeval, NULL)) if (setitimer(ITIMER_REAL, &timeval, NULL))
...@@ -1054,7 +1054,7 @@ disable_sig_alarm(bool is_statement_timeout) ...@@ -1054,7 +1054,7 @@ disable_sig_alarm(bool is_statement_timeout)
#ifndef __BEOS__ #ifndef __BEOS__
struct itimerval timeval; struct itimerval timeval;
MemSet((void *)&timeval, 0, sizeof(struct itimerval)); MemSet(&timeval, 0, sizeof(struct itimerval));
if (setitimer(ITIMER_REAL, &timeval, NULL)) if (setitimer(ITIMER_REAL, &timeval, NULL))
{ {
statement_timeout_active = deadlock_timeout_active = false; statement_timeout_active = deadlock_timeout_active = false;
...@@ -1120,7 +1120,7 @@ CheckStatementTimeout(void) ...@@ -1120,7 +1120,7 @@ CheckStatementTimeout(void)
#ifndef __BEOS__ #ifndef __BEOS__
struct itimerval timeval; struct itimerval timeval;
MemSet((void *)&timeval, 0, sizeof(struct itimerval)); MemSet(&timeval, 0, sizeof(struct itimerval));
timeval.it_value.tv_sec = statement_fin_time.tv_sec - now.tv_sec; 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; timeval.it_value.tv_usec = statement_fin_time.tv_usec - now.tv_usec;
if (timeval.it_value.tv_usec < 0) if (timeval.it_value.tv_usec < 0)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2003, PostgreSQL Global Development Group * Copyright (c) 2000-2003, PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.104 2003/10/11 16:30:55 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.105 2003/10/11 18:04:26 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
...@@ -1280,7 +1280,7 @@ unescape(const unsigned char *source, size_t len) ...@@ -1280,7 +1280,7 @@ unescape(const unsigned char *source, size_t len)
case '7': case '7':
case '8': case '8':
case '9': case '9':
c = parse_char((void *) &p); c = parse_char((char **) &p);
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment