On Thu, May 13, 2010 at 10:02:14AM +0200, Fabian Groffen wrote:

Changeset: db9f1c910dbb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db9f1c910dbb Modified Files: MonetDB5/src/mal/mal_linker.mx Branch: Jun2010 Log Message:

Fix compilation on Windows

.\..\..\..\src\mal\mal_linker.mx(62): catastrophic error: could not open source file "dirent.h"

Seems Sabaoth can use struct dirent without including dirent.h as well, so I guess some gdk header takes care of this. I just removed dirent.h include.

FYI: MonetDB/src/gdk/gdk.mx-#ifdef HAVE_DIRENT_H MonetDB/src/gdk/gdk.mx:# include <dirent.h> MonetDB/src/gdk/gdk.mx:# define NAMLEN(dirent) strlen((dirent)->d_name) MonetDB/src/gdk/gdk.mx-#else MonetDB/src/gdk/gdk.mx:# define dirent direct MonetDB/src/gdk/gdk.mx:# define NAMLEN(dirent) (dirent)->d_namlen MonetDB/src/gdk/gdk.mx-# ifdef HAVE_SYS_NDIR_H MonetDB/src/gdk/gdk.mx-# include <sys/ndir.h> MonetDB/src/gdk/gdk.mx-# endif MonetDB/src/gdk/gdk.mx-# ifdef HAVE_SYS_DIR_H MonetDB/src/gdk/gdk.mx-# include <sys/dir.h> MonetDB/src/gdk/gdk.mx-# endif MonetDB/src/gdk/gdk.mx-# ifdef HAVE_NDIR_H MonetDB/src/gdk/gdk.mx-# include <ndir.h> MonetDB/src/gdk/gdk.mx-# endif MonetDB/src/gdk/gdk.mx-#endif Stefan

diffs (11 lines):

diff -r e1c42586a988 -r db9f1c910dbb MonetDB5/src/mal/mal_linker.mx --- a/MonetDB5/src/mal/mal_linker.mx Wed May 12 16:58:04 2010 +0200 +++ b/MonetDB5/src/mal/mal_linker.mx Thu May 13 10:02:00 2010 +0200 @@ -59,7 +59,6 @@ #endif

#include <sys/types.h> /* opendir */ -#include <dirent.h> /* opendir */

/* #define DEBUG_MAL_LINKER */ #define MONET64 1 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list

-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4199 |