Changeset: b540445f1e7a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b540445f1e7a
Modified Files:
common/options/Makefile.ag
common/options/monet_options.c
common/options/monet_options.h
common/options/monet_options.mx
gdk/Makefile.ag
gdk/gdk_align.c
gdk/gdk_align.mx
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_delta.mx
gdk/gdk_heap.c
gdk/gdk_heap.mx
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_logger.mx
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_posix.mx
gdk/gdk_storage.c
gdk/gdk_storage.h
gdk/gdk_storage.mx
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_system.mx
gdk/gdk_tm.c
gdk/gdk_tm.h
gdk/gdk_tm.mx
geom/lib/Makefile.ag
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/lib/libgeom.mx
sql/backends/monet5/Makefile.ag
sql/backends/monet5/datacell/Makefile.ag
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/actuator.mx
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/basket.h
sql/backends/monet5/datacell/basket.mal
sql/backends/monet5/datacell/basket.mx
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.h
sql/backends/monet5/datacell/datacell.mal
sql/backends/monet5/datacell/datacell.mx
sql/backends/monet5/datacell/dcoperator.c
sql/backends/monet5/datacell/dcoperator.h
sql/backends/monet5/datacell/dcoperator.mal
sql/backends/monet5/datacell/dcoperator.mx
sql/backends/monet5/datacell/dcsocket.c
sql/backends/monet5/datacell/dcsocket.h
sql/backends/monet5/datacell/dcsocket.mx
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/emitter.h
sql/backends/monet5/datacell/emitter.mal
sql/backends/monet5/datacell/emitter.mx
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/opt_datacell.h
sql/backends/monet5/datacell/opt_datacell.mal
sql/backends/monet5/datacell/opt_datacell.mx
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/petrinet.h
sql/backends/monet5/datacell/petrinet.mal
sql/backends/monet5/datacell/petrinet.mx
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/datacell/receptor.h
sql/backends/monet5/datacell/receptor.mal
sql/backends/monet5/datacell/receptor.mx
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/datacell/sensor.mx
sql/backends/monet5/sql_bpm.c
sql/backends/monet5/sql_bpm.h
sql/backends/monet5/sql_bpm.mal
sql/backends/monet5/sql_bpm.mx
sql/backends/monet5/sql_emptyset.c
sql/backends/monet5/sql_emptyset.h
sql/backends/monet5/sql_emptyset.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_gencode.mx
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_optimizer.h
sql/backends/monet5/sql_optimizer.mx
sql/backends/monet5/sql_readline.c
sql/backends/monet5/sql_readline.h
sql/backends/monet5/sql_readline.mx
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_scenario.mx
sql/backends/monet5/sql_user.c
sql/backends/monet5/sql_user.h
sql/backends/monet5/sql_user.mx
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/fits.c
sql/backends/monet5/vaults/fits.h
sql/backends/monet5/vaults/fits.mal
sql/backends/monet5/vaults/fits.mx
sql/backends/monet5/vaults/mseed.c
sql/backends/monet5/vaults/mseed.h
sql/backends/monet5/vaults/mseed.mal
sql/backends/monet5/vaults/mseed.mx
sql/backends/monet5/vaults/vault.c
sql/backends/monet5/vaults/vault.h
sql/backends/monet5/vaults/vault.mal
sql/backends/monet5/vaults/vault.mx
sql/backends/monet5/vaults/vault.sql
template/src/monetdb5/Makefile.ag
template/src/monetdb5/example.c
template/src/monetdb5/example.h
template/src/monetdb5/example.mal
template/src/monetdb5/example.mx
Branch: default
Log Message:
Converted .mx files to .c/.h files.
This conversion was only done on files outside of monetdb5 which did
not contain any MX macros.
diffs (truncated from 13081 to 300 lines):
diff --git a/common/options/Makefile.ag b/common/options/Makefile.ag
--- a/common/options/Makefile.ag
+++ b/common/options/Makefile.ag
@@ -19,10 +19,10 @@
MTSAFE
-EXTRA_DIST = monet_getopt.h getopt.c getopt1.c
+EXTRA_DIST = monet_getopt.h getopt.c getopt1.c monet_options.h
lib_moptions = {
NOINST
NAME = moptions
- SOURCES = monet_options.mx monet_getopt.h
+ SOURCES = monet_options.c monet_getopt.h
}
diff --git a/common/options/monet_options.mx b/common/options/monet_options.c
rename from common/options/monet_options.mx
rename to common/options/monet_options.c
--- a/common/options/monet_options.mx
+++ b/common/options/monet_options.c
@@ -1,92 +1,34 @@
-@/
-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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+/*
+ * 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * 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-2011 MonetDB B.V.
+ * All Rights Reserved.
+ */
-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-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f monet_options
-@a N.J. Nes
-@* A simple option handling library
-@T
-The monet server and clients make use of command line options and a (possibly)
-shared config file. With this library a set (represented by set,setlen) of
-options is created. An option is stored as name and value strings with a
-special flag indicating the origin of the options, (builtin, system config
-file, special config file or command line option).
-
-@h
-#ifndef _MO_H_
-#define _MO_H_
-
-typedef enum opt_kind {
- opt_builtin = 0,
- opt_config = 1,
- opt_cmdline = 2
-} opt_kind;
-
-typedef struct opt {
- opt_kind kind;
- char *name;
- char *value;
-} opt;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef moptions_export
-/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
-#define moptions_export extern __declspec(dllimport)
-#else
-#define moptions_export extern __declspec(dllexport)
-#endif
-#else
-#define moptions_export extern
-#endif
-#endif
-
-/* mo_print_options will print the option set on stderr */
-moptions_export void mo_print_options(opt *set, int setlen);
-
-/* mo_find_option, finds the option with the given name in the option set
- (set,setlen). */
-moptions_export char *mo_find_option(opt *set, int setlen, const char *name);
-
-/* mo_system_config will add the options from the system config file
- (returns the new setlen) */
-moptions_export int mo_system_config(opt **Set, int setlen);
-
-/* mo_builtin_settings, will place the builtin settings into a new
- option set (returns the length of this set). */
-moptions_export int mo_builtin_settings(opt **Set);
-
-/* mo_add_option will add a single option to the option set
- (returns new length) */
-moptions_export int mo_add_option(opt **Set, int setlen, opt_kind kind, const
char *name, const char *value);
-
-/* mo_free_options will free the resouces take by the options set */
-moptions_export void mo_free_options(opt *set, int setlen);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-@c
+/*
+ * @f monet_options
+ * @a N.J. Nes
+ * @* A simple option handling library
+ * @T
+ * The monet server and clients make use of command line options and a
(possibly)
+ * shared config file. With this library a set (represented by set,setlen) of
+ * options is created. An option is stored as name and value strings with a
+ * special flag indicating the origin of the options, (builtin, system config
+ * file, special config file or command line option).
+ *
+ */
#include "monetdb_config.h"
#include "monet_options.h"
#ifndef HAVE_GETOPT_LONG
diff --git a/common/options/monet_options.h b/common/options/monet_options.h
new file mode 100644
--- /dev/null
+++ b/common/options/monet_options.h
@@ -0,0 +1,77 @@
+/*
+ * 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * 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-2011 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+#ifndef _MO_H_
+#define _MO_H_
+
+typedef enum opt_kind {
+ opt_builtin = 0,
+ opt_config = 1,
+ opt_cmdline = 2
+} opt_kind;
+
+typedef struct opt {
+ opt_kind kind;
+ char *name;
+ char *value;
+} opt;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef moptions_export
+/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+#define moptions_export extern __declspec(dllimport)
+#else
+#define moptions_export extern __declspec(dllexport)
+#endif
+#else
+#define moptions_export extern
+#endif
+#endif
+
+/* mo_print_options will print the option set on stderr */
+moptions_export void mo_print_options(opt *set, int setlen);
+
+/* mo_find_option, finds the option with the given name in the option set
+ (set,setlen). */
+moptions_export char *mo_find_option(opt *set, int setlen, const char *name);
+
+/* mo_system_config will add the options from the system config file
+ (returns the new setlen) */
+moptions_export int mo_system_config(opt **Set, int setlen);
+
+/* mo_builtin_settings, will place the builtin settings into a new
+ option set (returns the length of this set). */
+moptions_export int mo_builtin_settings(opt **Set);
+
+/* mo_add_option will add a single option to the option set
+ (returns new length) */
+moptions_export int mo_add_option(opt **Set, int setlen, opt_kind kind, const
char *name, const char *value);
+
+/* mo_free_options will free the resouces take by the options set */
+moptions_export void mo_free_options(opt *set, int setlen);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -22,7 +22,7 @@
gdk_scanselect_CFLAGS = $(NO_INLINE_CFLAGS)
# gdk_relop.mx
-EXTRA_DIST = gdk_scanselect_defs.mx gdk_private.h
+EXTRA_DIST = gdk_scanselect_defs.mx gdk_private.h gdk_delta.h gdk_logger.h
gdk_posix.h gdk_system.h gdk_tm.h gdk_storage.h
lib_gdk = {
VERSION = $(GDK_VERSION)
@@ -39,12 +39,12 @@
gdk_scanselect_defs_fix.mx \
gdk_scanselect_defs_var.mx \
gdk_scanselect.mx gdk.mx gdk_batop.mx \
- gdk_search.mx gdk_tm.mx gdk_align.mx gdk_bbp.mx \
- gdk_heap.mx gdk_setop.mx gdk_utils.mx gdk_atoms.mx \
- gdk_qsort.mx gdk_ssort.mx gdk_storage.mx gdk_bat.mx \
- gdk_delta.mx gdk_relop.mx gdk_system.mx gdk_value.mx \
+ gdk_search.mx gdk_tm.c gdk_align.c gdk_bbp.mx \
+ gdk_heap.c gdk_setop.mx gdk_utils.mx gdk_atoms.mx \
+ gdk_qsort.mx gdk_ssort.mx gdk_storage.c gdk_bat.mx \
+ gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.mx \
gdk_rangejoin.mx \
- gdk_posix.mx gdk_logger.mx bat.feps bat1.feps bat2.feps \
+ gdk_posix.c gdk_logger.c bat.feps bat1.feps bat2.feps \
libbat.rc
LIBS = ../common/options/libmoptions \
../common/stream/libstream \
diff --git a/gdk/gdk_align.mx b/gdk/gdk_align.c
rename from gdk/gdk_align.mx
rename to gdk/gdk_align.c
--- a/gdk/gdk_align.mx
+++ b/gdk/gdk_align.c
@@ -1,84 +1,84 @@
-@/
-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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+/*
+ * 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * 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-2011 MonetDB B.V.
+ * All Rights Reserved.
+ */
-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-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f gdk_align
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
