MonetDB: default - Ported recent changes to Windows.

[Sjoerd Mullender]

Changeset: 35e85d508b26 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35e85d508b26
Modified Files:
        clients/mapiclient/eventparser.c
        clients/mapiclient/eventparser.h
        monetdb5/mal/mal_profiler.c
Branch: default
Log Message:

Ported recent changes to Windows.


diffs (49 lines):

diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c
--- a/clients/mapiclient/eventparser.c
+++ b/clients/mapiclient/eventparser.c
@@ -209,7 +209,7 @@ keyvalueparser(char *txt, EventRecord *e
                return 0;
        }
        if( strstr(key,"ctime")){
-               long sec;
+               time_t sec;
                struct tm curr_time;
 
                c = strchr(val,'.');
diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h
--- a/clients/mapiclient/eventparser.h
+++ b/clients/mapiclient/eventparser.h
@@ -29,15 +29,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
 #endif
 
 #define TME_US  1
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -22,7 +22,9 @@
 #include "mal_debugger.h"
 #include "mal_resource.h"
 
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 
 static void cachedProfilerEvent(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list