-#line 7630 "configure"
+#line 7566 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:7641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
X11_LIBS=""
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:7674: checking for XOpenDisplay in -lX11" >&5
+echo "configure:7610: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lX11 ${X_PRE_LIBS} $LIBS"
cat > conftest.$ac_ext <
-#line 7682 "configure"
+#line 7618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
AC_C_CONST
AC_C_INLINE
AC_C_STRINGIZE
-PGAC_C_SIGNED
-PGAC_C_VOLATILE
AC_STRUCT_TIMEZONE
PGAC_UNION_SEMUN
* 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 $
*
*-------------------------------------------------------------------------
*/
*/
void
-Async_NotifyHandler(SIGNAL_ARGS)
+Async_NotifyHandler(int signum)
{
/*
*
*
* 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
*
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);
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[]);
* main loop
*/
static void
-SIGHUP_handler(SIGNAL_ARGS)
+SIGHUP_handler(int signum)
{
got_SIGHUP = true;
if (Shutdown > SmartShutdown)
* 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:
* 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
}
static void
-dumpstatus(SIGNAL_ARGS)
+dumpstatus(int signum)
{
Dlelem *curr;
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
* 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
#include
#include "storage/proc.h"
-void HandleDeadLock(SIGNAL_ARGS);
+void HandleDeadLock(int signum);
static void ProcFreeAllSemaphores(void);
static bool GetOffWaitqueue(PROC *);
* --------------------
*/
void
-HandleDeadLock(SIGNAL_ARGS)
+HandleDeadLock(int signum)
{
LOCK *mywaitlock;
*
*
* 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
extern void StartupXLOG(void);
extern void ShutdownXLOG(void);
-extern void HandleDeadLock(SIGNAL_ARGS);
+extern void HandleDeadLock(int signum);
extern char XLogDir[];
extern char ControlFilePath[];
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
*/
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:"
* Abort transaction and exit
*/
void
-die(SIGNAL_ARGS)
+die(int signum)
{
PG_SETMASK(&BlockSig);
/* 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"
/* signal handler for query cancel signal from postmaster */
static void
-QueryCancelHandler(SIGNAL_ARGS)
+QueryCancelHandler(int signum)
{
QueryCancel = true;
LockWaitCancel();
}
static void
-SigHupHandler(SIGNAL_ARGS)
+SigHupHandler(int signum)
{
got_SIGHUP = true;
}
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");
}
/*
*
* 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"
#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)
*
* 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
extern PGconn *cancelConn;
#ifndef WIN32
-void handle_sigint(SIGNAL_ARGS);
+void handle_sigint(int signum);
#endif /* not WIN32 */
* 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 $
*
*-------------------------------------------------------------------------
*/
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.
* 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
/* 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
#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 */
* 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
#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[]);
projects / postgresql.git / commitdiff