open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove configure tests for `signed', `volatile', and signal handler args;

Browse Source 
the harm potential outweighs the possible benefits.
REL7_1_STABLE
Peter Eisentraut 26 years ago
parent bfdd6a716d
commit 79abd73eee
13 changed files with 229 additions and 377 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 41
      aclocal.m4
  2. 33
      config/c-compiler.m4
  3. 430
      configure
  4. 2
      configure.in
  5. 4
      src/backend/commands/async.c
  6. 24
      src/backend/postmaster/postmaster.c
  7. 8
      src/backend/storage/lmgr/proc.c
  8. 24
      src/backend/tcop/postgres.c
  9. 4
      src/bin/psql/common.c
  10. 4
      src/bin/psql/common.h
  11. 4
      src/include/commands/async.h
  12. 22
      src/include/config.h.in
  13. 6
      src/include/tcop/tcopprot.h

41
aclocal.m4 vendored
Unescape View File

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.4 2000/08/26 21:11:44 petere Exp $
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.5 2000/08/27 19:00:00 petere Exp $
# This comes from the official Autoconf macro archive at
# <http://research.cys.de/autoconf-archive/>
# (I removed the $ before the Id CVS keyword below.)
@ -65,38 +65,7 @@ extern accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_acc
AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3,$ac_cv_func_accept_arg3)
])
# Macros to detect C compiler features
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.4 2000/08/26 21:11:44 petere Exp $
# PGAC_C_SIGNED
# -------------
# Check if the C compiler understands signed types.
# (Of course any ISO C compiler should, what is this still doing here?)
AC_DEFUN([PGAC_C_SIGNED],
[AC_CACHE_CHECK(for signed types, pgac_cv_c_signed,
[AC_TRY_COMPILE([],
[signed char c; signed short s; signed int i;],
[pgac_cv_c_signed=yes],
[pgac_cv_c_signed=no])])
if test x"$pgac_cv_c_signed" = xno ; then
AC_DEFINE(signed,, [Define empty if the C compiler does not understand signed types])
fi])# PGAC_C_SIGNED
# PGAC_C_VOLATILE
# ---------------
# Check if the C compiler understands `volatile'. Note that if it doesn't
# then this will potentially break the program semantics.
AC_DEFUN([PGAC_C_VOLATILE],
[AC_CACHE_CHECK(for volatile, pgac_cv_c_volatile,
[AC_TRY_COMPILE([],
[extern volatile int i;],
[pgac_cv_c_volatile=yes],
[pgac_cv_c_volatile=no])])
if test x"$pgac_cv_c_volatile" = xno ; then
AC_DEFINE(volatile,, [Define empty if the C compiler does not understand `volatile'])
fi])# PGAC_C_VOLATILE
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.5 2000/08/27 19:00:00 petere Exp $
@ -185,7 +154,7 @@ undefine([AC_TYPE_NAME])dnl
undefine([AC_CV_NAME])dnl
])# PGAC_CHECK_ALIGNOF
# Macros that test various C library quirks
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.4 2000/08/26 21:11:44 petere Exp $
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.5 2000/08/27 19:00:00 petere Exp $
# PGAC_VAR_INT_TIMEZONE
@ -264,7 +233,7 @@ fi
HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
# Macros to detect certain C++ features
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.4 2000/08/26 21:11:44 petere Exp $
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.5 2000/08/27 19:00:00 petere Exp $
# PGAC_CLASS_STRING
@ -333,7 +302,7 @@ fi])# PGAC_CXX_NAMESPACE_STD
#
# Autoconf macros for configuring the build of Python extension modules
#
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.4 2000/08/26 21:11:44 petere Exp $
# $Header: /cvsroot/pgsql/aclocal.m4,v 1.5 2000/08/27 19:00:00 petere Exp $
#
# PGAC_PROG_PYTHON

33
config/c-compiler.m4
Unescape View File

@ -1,36 +1,5 @@
# Macros to detect C compiler features
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.1 2000/06/11 11:39:46 petere Exp $
# PGAC_C_SIGNED
# -------------
# Check if the C compiler understands signed types.
# (Of course any ISO C compiler should, what is this still doing here?)
AC_DEFUN([PGAC_C_SIGNED],
[AC_CACHE_CHECK(for signed types, pgac_cv_c_signed,
[AC_TRY_COMPILE([],
[signed char c; signed short s; signed int i;],
[pgac_cv_c_signed=yes],
[pgac_cv_c_signed=no])])
if test x"$pgac_cv_c_signed" = xno ; then
AC_DEFINE(signed,, [Define empty if the C compiler does not understand signed types])
fi])# PGAC_C_SIGNED
# PGAC_C_VOLATILE
# ---------------
# Check if the C compiler understands `volatile'. Note that if it doesn't
# then this will potentially break the program semantics.
AC_DEFUN([PGAC_C_VOLATILE],
[AC_CACHE_CHECK(for volatile, pgac_cv_c_volatile,
[AC_TRY_COMPILE([],
[extern volatile int i;],
[pgac_cv_c_volatile=yes],
[pgac_cv_c_volatile=no])])
if test x"$pgac_cv_c_volatile" = xno ; then
AC_DEFINE(volatile,, [Define empty if the C compiler does not understand `volatile'])
fi])# PGAC_C_VOLATILE
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.2 2000/08/27 19:00:22 petere Exp $

430
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.in
Unescape View File

@ -817,8 +817,6 @@ fi
AC_C_CONST
AC_C_INLINE
AC_C_STRINGIZE
PGAC_C_SIGNED
PGAC_C_VOLATILE
AC_STRUCT_TIMEZONE
PGAC_UNION_SEMUN

4
src/backend/commands/async.c
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.66 2000/07/08 03:04:12 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.67 2000/08/27 19:00:24 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -587,7 +587,7 @@ AtAbort_Notify()
*/
void
Async_NotifyHandler(SIGNAL_ARGS)
Async_NotifyHandler(int signum)
{
/*

24
src/backend/postmaster/postmaster.c
Unescape View File

@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.160 2000/08/20 10:55:33 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.161 2000/08/27 19:00:26 petere Exp $
*
* NOTES
*
@ -231,10 +231,10 @@ static void pmdaemonize(int argc, char *argv[]);
static Port *ConnCreate(int serverFd);
static void ConnFree(Port *port);
static void reset_shared(int port);
static void SIGHUP_handler(SIGNAL_ARGS);
static void pmdie(SIGNAL_ARGS);
static void reaper(SIGNAL_ARGS);
static void dumpstatus(SIGNAL_ARGS);
static void SIGHUP_handler(int signum);
static void pmdie(int signum);
static void reaper(int signum);
static void dumpstatus(int signum);
static void CleanupProc(int pid, int exitstatus);
static int DoBackend(Port *port);
static void ExitPostmaster(int status);
@ -246,7 +246,7 @@ static int processCancelRequest(Port *port, PacketLen len, void *pkt);
static int initMasks(fd_set *rmask, fd_set *wmask);
static long PostmasterRandom(void);
static void RandomSalt(char *salt);
static void SignalChildren(SIGNAL_ARGS);
static void SignalChildren(int signum);
static int CountChildren(void);
static bool CreateOptsFile(int argc, char *argv[]);
@ -1266,7 +1266,7 @@ reset_shared(int port)
* main loop
*/
static void
SIGHUP_handler(SIGNAL_ARGS)
SIGHUP_handler(int signum)
{
got_SIGHUP = true;
if (Shutdown > SmartShutdown)
@ -1281,14 +1281,14 @@ SIGHUP_handler(SIGNAL_ARGS)
* pmdie -- signal handler for cleaning up after a kill signal.
*/
static void
pmdie(SIGNAL_ARGS)
pmdie(int signum)
{
PG_SETMASK(&BlockSig);
if (DebugLvl >= 1)
elog(DEBUG, "pmdie %d", postgres_signal_arg);
elog(DEBUG, "pmdie %d", signum);
switch (postgres_signal_arg)
switch (signum)
{
case SIGUSR2:
@ -1399,7 +1399,7 @@ pmdie(SIGNAL_ARGS)
* Reaper -- signal handler to cleanup after a backend (child) dies.
*/
static void
reaper(SIGNAL_ARGS)
reaper(int signum)
{
/* GH: replace waitpid for !HAVE_WAITPID. Does this work ? */
#ifdef HAVE_WAITPID
@ -1970,7 +1970,7 @@ ExitPostmaster(int status)
}
static void
dumpstatus(SIGNAL_ARGS)
dumpstatus(int signum)
{
Dlelem *curr;

8
src/backend/storage/lmgr/proc.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.77 2000/07/31 01:16:24 inoue Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.78 2000/08/27 19:00:28 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -47,7 +47,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.77 2000/07/31 01:16:24 inoue Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.78 2000/08/27 19:00:28 petere Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@ -68,7 +68,7 @@
#include "storage/proc.h"
void HandleDeadLock(SIGNAL_ARGS);
void HandleDeadLock(int signum);
static void ProcFreeAllSemaphores(void);
static bool GetOffWaitqueue(PROC *);
@ -812,7 +812,7 @@ ProcAddLock(SHM_QUEUE *elem)
* --------------------
*/
void
HandleDeadLock(SIGNAL_ARGS)
HandleDeadLock(int signum)
{
LOCK *mywaitlock;

24
src/backend/tcop/postgres.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.171 2000/08/11 23:45:35 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.172 2000/08/27 19:00:31 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -83,7 +83,7 @@ CommandDest whereToSendOutput = Debug;
extern void StartupXLOG(void);
extern void ShutdownXLOG(void);
extern void HandleDeadLock(SIGNAL_ARGS);
extern void HandleDeadLock(int signum);
extern char XLogDir[];
extern char ControlFilePath[];
@ -129,9 +129,9 @@ int XfuncMode = 0;
static int InteractiveBackend(StringInfo inBuf);
static int SocketBackend(StringInfo inBuf);
static int ReadCommand(StringInfo inBuf);
static void SigHupHandler(SIGNAL_ARGS);
static void FloatExceptionHandler(SIGNAL_ARGS);
static void quickdie(SIGNAL_ARGS);
static void SigHupHandler(int signum);
static void FloatExceptionHandler(int signum);
static void quickdie(int signum);
/*
* Flag to mark SIGHUP. Whenever the main loop comes around it
@ -705,13 +705,13 @@ pg_exec_query_dest(char *query_string, /* string to execute */
*/
void
handle_warn(SIGNAL_ARGS)
handle_warn(int signum)
{
siglongjmp(Warn_restart, 1);
}
static void
quickdie(SIGNAL_ARGS)
quickdie(int signum)
{
PG_SETMASK(&BlockSig);
elog(NOTICE, "Message from PostgreSQL backend:"
@ -735,7 +735,7 @@ quickdie(SIGNAL_ARGS)
* Abort transaction and exit
*/
void
die(SIGNAL_ARGS)
die(int signum)
{
PG_SETMASK(&BlockSig);
@ -752,7 +752,7 @@ die(SIGNAL_ARGS)
/* signal handler for floating point exception */
static void
FloatExceptionHandler(SIGNAL_ARGS)
FloatExceptionHandler(int signum)
{
elog(ERROR, "floating point exception!"
" The last floating point operation either exceeded legal ranges"
@ -761,7 +761,7 @@ FloatExceptionHandler(SIGNAL_ARGS)
/* signal handler for query cancel signal from postmaster */
static void
QueryCancelHandler(SIGNAL_ARGS)
QueryCancelHandler(int signum)
{
QueryCancel = true;
LockWaitCancel();
@ -779,7 +779,7 @@ CancelQuery(void)
}
static void
SigHupHandler(SIGNAL_ARGS)
SigHupHandler(int signum)
{
got_SIGHUP = true;
}
@ -1404,7 +1404,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.171 $ $Date: 2000/08/11 23:45:35 $\n");
puts("$Revision: 1.172 $ $Date: 2000/08/27 19:00:31 $\n");
}
/*

4
src/bin/psql/common.c
Unescape View File

@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.21 2000/07/02 15:21:17 petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.22 2000/08/27 19:00:34 petere Exp $
*/
#include "postgres.h"
#include "common.h"
@ -252,7 +252,7 @@ volatile bool cancel_pressed;
#define write_stderr(String) write(fileno(stderr), String, strlen(String))
void
handle_sigint(SIGNAL_ARGS)
handle_sigint(int signum)
{
/* Don't muck around if copying in or prompting for a password. */
if ((copy_in_state && pset.cur_cmd_interactive) || prompt_state)

4
src/bin/psql/common.h
Unescape View File

@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.10 2000/04/12 17:16:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.11 2000/08/27 19:00:36 petere Exp $
*/
#ifndef COMMON_H
#define COMMON_H
@ -34,7 +34,7 @@ extern volatile bool cancel_pressed;
extern PGconn *cancelConn;
#ifndef WIN32
void handle_sigint(SIGNAL_ARGS);
void handle_sigint(int signum);
#endif /* not WIN32 */

4
src/include/commands/async.h
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: async.h,v 1.14 2000/05/31 00:28:37 petere Exp $
* $Id: async.h,v 1.15 2000/08/27 19:00:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -25,7 +25,7 @@ extern void AtCommit_Notify(void);
extern void AtAbort_Notify(void);
/* signal handler for inbound notifies (SIGUSR2) */
extern void Async_NotifyHandler(SIGNAL_ARGS);
extern void Async_NotifyHandler(int signum);
/*
* enable/disable processing of inbound notifies directly from signal handler.

22
src/include/config.h.in
Unescape View File

@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure.
*
* $Id: config.h.in,v 1.132 2000/08/26 21:53:40 tgl Exp $
* $Id: config.h.in,v 1.133 2000/08/27 19:00:39 petere Exp $
*/
#ifndef CONFIG_H
@ -300,12 +300,6 @@
/* Define as your compiler's spelling of "inline", or empty if no inline. */
#undef inline
/* Define signed as empty if your compiler doesn't grok "signed char" etc */
#undef signed
/* Define volatile as empty if your compiler doesn't grok volatile. */
#undef volatile
/* Define if your cpp understands the ANSI stringizing operators in macros */
#undef HAVE_STRINGIZE
@ -588,18 +582,4 @@ extern void srandom(unsigned int seed);
#include "os.h"
/*
* The following is used as the arg list for signal handlers. Any ports
* that take something other than an int argument should override this in
* the port-specific os.h file. Note that variable names are required
* because it is used in both the prototypes as well as the definitions.
* Note also the long name. We expect that this won't collide with
* other names causing compiler warnings.
*/
#ifndef SIGNAL_ARGS
#define SIGNAL_ARGS int postgres_signal_arg
#endif
#endif /* CONFIG_H */

6
src/include/tcop/tcopprot.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: tcopprot.h,v 1.31 2000/06/28 03:33:28 tgl Exp $
* $Id: tcopprot.h,v 1.32 2000/08/27 19:00:41 petere Exp $
*
* OLD COMMENTS
* This file was created so that other c files could get the two
@ -41,8 +41,8 @@ extern void pg_exec_query_dest(char *query_string,
#endif /* BOOTSTRAP_INCLUDE */
extern void handle_warn(SIGNAL_ARGS);
extern void die(SIGNAL_ARGS);
extern void handle_warn(int signum);
extern void die(int signum);
extern void CancelQuery(void);
extern int PostgresMain(int argc, char *argv[],
int real_argc, char *real_argv[]);

Write Preview
Loading…
Cancel
Save