From 49656346b87fd4a1c7ea82b3b909a39daa9a2dd1 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 24 Nov 1997 05:32:56 +0000 Subject: Move dbcommands.c to commands/. It should not be in the parser directory. --- src/backend/commands/dbcommands.c | 4 ++-- src/backend/parser/keywords.c | 4 +--- src/backend/tcop/utility.c | 4 ++-- src/include/commands/dbcommands.h | 26 ++++++++++++++++++++++++++ src/include/parser/dbcommands.h | 26 -------------------------- 5 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 src/include/commands/dbcommands.h delete mode 100644 src/include/parser/dbcommands.h (limited to 'src') diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index cd0333ea683..861ce8db810 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.1 1997/11/24 05:20:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.2 1997/11/24 05:32:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ #include "catalog/pg_user.h" #include "catalog/pg_database.h" #include "utils/syscache.h" -#include "parser/dbcommands.h" +#include "commands/dbcommands.h" #include "tcop/tcopprot.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index 5b6274cf6fb..0312e0251be 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.23 1997/11/21 18:10:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.24 1997/11/24 05:32:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,6 @@ #include "parse.h" #include "utils/elog.h" #include "parser/keywords.h" -#include "parser/dbcommands.h" /* createdb, destroydb stop_vacuum */ - /* * List of (keyword-name, keyword-token-value) pairs. diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 0ce74f31e5e..2e9b764644d 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -9,12 +9,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.30 1997/11/21 19:02:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.31 1997/11/24 05:32:40 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "parser/dbcommands.h" #include "access/xact.h" #include "access/heapam.h" #include "catalog/catalog.h" @@ -25,6 +24,7 @@ #include "commands/command.h" #include "commands/copy.h" #include "commands/creatinh.h" +#include "commands/dbcommands.h" #include "commands/sequence.h" #include "commands/defrem.h" #include "commands/rename.h" diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h new file mode 100644 index 00000000000..7717fd9d153 --- /dev/null +++ b/src/include/commands/dbcommands.h @@ -0,0 +1,26 @@ +/*------------------------------------------------------------------------- + * + * dbcommands.h-- + * + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: dbcommands.h,v 1.1 1997/11/24 05:32:51 momjian Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef DBCOMMANDS_H +#define DBCOMMANDS_H + +/* + * Originally from tmp/daemon.h. The functions declared in daemon.h does not + * exist; hence removed. -- AY 7/29/94 + */ +#define SIGKILLDAEMON1 SIGINT +#define SIGKILLDAEMON2 SIGTERM + +extern void createdb(char *dbname, char *dbpath); +extern void destroydb(char *dbname); + +#endif /* DBCOMMANDS_H */ diff --git a/src/include/parser/dbcommands.h b/src/include/parser/dbcommands.h deleted file mode 100644 index 31c6efd2db8..00000000000 --- a/src/include/parser/dbcommands.h +++ /dev/null @@ -1,26 +0,0 @@ -/*------------------------------------------------------------------------- - * - * dbcommands.h-- - * - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: dbcommands.h,v 1.5 1997/11/07 06:38:09 thomas Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef DBCOMMANDS_H -#define DBCOMMANDS_H - -/* - * Originally from tmp/daemon.h. The functions declared in daemon.h does not - * exist; hence removed. -- AY 7/29/94 - */ -#define SIGKILLDAEMON1 SIGINT -#define SIGKILLDAEMON2 SIGTERM - -extern void createdb(char *dbname, char *dbpath); -extern void destroydb(char *dbname); - -#endif /* DBCOMMANDS_H */ -- cgit v1.2.3