Changeset: 7f3c5b72b12f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f3c5b72b12f
Added Files:
monetdb5/mal/mal_private.h
Modified Files:
monetdb5/mal/Makefile.ag
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_session.c
Branch: Feb2013
Log Message:
Don't export MCexitClient, it's not needed outside of libmonetdb5.
diffs (73 lines):
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -59,7 +59,8 @@ lib_mal = {
mal_stack.c mal_stack.h \
mal_type.c mal_type.h \
mal_utils.c mal_utils.h \
- mal_xml.c mal_xml.h
+ mal_xml.c mal_xml.h \
+ mal_private.h
}
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -56,6 +56,7 @@
#include "mal_import.h"
#include "mal_parser.h"
#include "mal_namespace.h"
+#include "mal_private.h"
#include <mapi.h> /* for PROMPT1 */
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -198,7 +198,6 @@ mal_export int MCdefault;
mal_export Client MCgetClient(int id);
mal_export Client MCinitClient(oid user, bstream *fin, stream *fout);
mal_export Client MCinitClientRecord(Client c, oid user, bstream *fin, stream
*fout);
-mal_export void MCexitClient(Client c);
mal_export int MCinitClientThread(Client c);
mal_export void MCcloseClient(Client c);
mal_export Client MCforkClient(Client c);
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/mal_private.h
@@ -0,0 +1,22 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2013 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+/* This file should not be included in any file outside of this directory */
+
+extern void MCexitClient(Client c);
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -27,6 +27,7 @@
#include "mal_readline.h"
#include "mal_authorize.h"
#include "mal_sabaoth.h"
+#include "mal_private.h"
#include <gdk.h> /* for opendir and friends */
/*
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
