MonetDB: default - Merged from Mar2011

[Fabian Groffen]

Changeset: e08625ce68e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e08625ce68e2
Modified Files:
        buildtools/Mx/Form.c
        buildtools/Mx/Mx.c
        configure.ag
        gdk/gdk_posix.mx
        gdk/gdk_system.mx
Branch: default
Log Message:

Merged from Mar2011


diffs (101 lines):

diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -278,7 +278,6 @@
 FormBlk(Def * d)
 {
        Tok *t;
-       int i;
 
        for (t = FstTok(d->d_blk); t; t = NxtTok(t)) {
                switch (t->t_dir) {
@@ -292,7 +291,6 @@
                        PrModeStr(t->t_str, t->t_dir);
                        break;
                case T_INDEX:
-                       i = t->t_ext - '0';
                        PrStr(t->t_str);
                        break;
                case T_SGML:
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -70,9 +70,7 @@
 }
 
 int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
 {
        int i, k;
 
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2399,7 +2399,7 @@
        if test "x$have_geos" != xno; then
                save_LIBS="$LIBS"
                LIBS="$LIBS $GEOS_LIBS"
-               AC_CHECK_LIB(geos_c, GEOSEnvelope, :, [AC_MSG_ERROR([-lgeos_c 
not found]); have_geos=no])
+               AC_CHECK_LIB(geos_c, GEOSEnvelope, :, have_geos=no)
                LIBS="$save_LIBS"
        fi
        if test "x$have_geos" != xno; then
diff --git a/gdk/gdk_posix.mx b/gdk/gdk_posix.mx
--- a/gdk/gdk_posix.mx
+++ b/gdk/gdk_posix.mx
@@ -32,6 +32,7 @@
 #ifndef GDK_POSIX_H
 #define GDK_POSIX_H
 
+#include "monetdb_config.h"
 #include <sys/types.h>
 
 #ifdef HAVE_MALLOC_H
@@ -286,13 +287,17 @@
 
 #endif
 
+#define _errno         win_errno
+
+gdk_export int *win_errno(void);
+
 #endif /* GDK_POSIX_H */
 @c
-#include "monetdb_config.h"
-#include "gdk.h"
+#include "gdk.h"        /* includes gdk_posix.h */
 #include "mutils.h"
 #include <stdio.h>
 #include <unistd.h>            /* sbrk on Solaris */
+#include <string.h>     /* strncpy */
 
 #if defined(__hpux)
 extern char *sbrk(int);
@@ -1858,12 +1863,6 @@
 
 #define GDK_WIN_ERRNO_TLS 13
 
-@h
-#define _errno         win_errno
-
-gdk_export int *win_errno(void);
-
-@c
 int *
 win_errno(void)
 {
diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx
--- a/gdk/gdk_system.mx
+++ b/gdk/gdk_system.mx
@@ -39,6 +39,8 @@
 #ifndef _GDK_SYSTEM_H_
 #define _GDK_SYSTEM_H_
 
+#include "monetdb_config.h"
+
 #ifdef NATIVE_WIN32
 #ifndef LIBGDK
 #define gdk_export extern __declspec(dllimport)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list