*** pgsql/src/bin/scripts/common.c 2009/02/26 16:02:38 1.35 --- pgsql/src/bin/scripts/common.c 2009/04/05 04:19:59 1.36 *************** *** 7,13 **** * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.34 2009/02/25 13:24:40 petere Exp $ * *------------------------------------------------------------------------- */ --- 7,13 ---- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.35 2009/02/26 16:02:38 petere Exp $ * *------------------------------------------------------------------------- */ *************** *** 24,33 **** static void SetCancelConn(PGconn *conn); static void ResetCancelConn(void); - #ifndef HAVE_INT_OPTRESET - int optreset; - #endif - static PGcancel *volatile cancelConn = NULL; #ifdef WIN32 --- 24,29 ----