[Monetdb-checkins] MonetDB5/src/tools monet_version.c.in, MonetDB_5-2, 1.1.2.1, 1.1.2.2 mserver5.mx, MonetDB_5-2, 1.29.2.2, 1.29.2.3

[Sjoerd Mullender]

Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8520

Modified Files:
      Tag: MonetDB_5-2
        monet_version.c.in mserver5.mx 
Log Message:
Get monet_version.c to actually compile.
Also moved the exit to the caller instead of the callee.

Index: mserver5.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/Attic/mserver5.mx,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- mserver5.mx 14 Oct 2007 08:20:22 -0000      1.29.2.2
+++ mserver5.mx 14 Oct 2007 12:25:40 -0000      1.29.2.3
@@ -186,13 +186,6 @@
 @-
 Version information, and compile time options.
 @c
-#ifdef HAVE_LIBPCRE
-#include <pcre.h>
-#endif
-#ifdef HAVE_OPENSSL
-#include <openssl/opensslv.h>
-#endif
-
 str
 absolute_path(str s)
 {
@@ -432,7 +425,7 @@
                        }
                        if (strcmp(long_options[option_index].name, "version") 
== 0) {
                                monet_version();
-                               break;
+                               exit(0);
                        }
                        /* debugging options */
                        if (strcmp(long_options[option_index].name, 
"properties") == 0) {

Index: monet_version.c.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/Attic/monet_version.c.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- monet_version.c.in  14 Oct 2007 08:20:22 -0000      1.1.2.1
+++ monet_version.c.in  14 Oct 2007 12:25:40 -0000      1.1.2.2
@@ -1,8 +1,16 @@
-
+#include "mal_config.h"
+#include "mal.h"
+#include <stdio.h>
 #include "monet_version.h"
+#ifdef HAVE_LIBPCRE
+#include <pcre.h>
+#endif
+#ifdef HAVE_OPENSSL
+#include <openssl/opensslv.h>
+#endif
 
 void
-monet_version()
+monet_version(void)
 {
        printf("MonetDB server v" VERSION " (" SZFMT "-bit), "
                        "based on kernel v%s (" SZFMT "-bit oids)\n",
@@ -25,5 +33,4 @@
 #else
        printf("Linking    : %s\n", "@linkercall@");
 #endif
-       exit(0);
 }


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
Monetdb-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins