[geos-devel] timeval.h simplification

[Charlie Savage]

Getting MingW/Msys to work requires changing profile.h and timeval.h. A couple of years ago we added timeval.h since MingW did not include the gettimeofday function. However, this function was added to MingW last summer so now the build blows up.

This comes into play in profiler.h, which has this rather obscure logic:

#ifndef _MSC_VER
#  include <sys/time.h>
#endif
#include <geos/timeval.h>



I simplified this to:

#ifdef _MSC_VER
#include <geos/timeval.h>
#else
#include <sys/time.h>
#endif

And removed the extra checking in geos/timeval.h.

So the rule is:

* If using MSCV++ include geos/timval.h
* If not, include sys/time.h



Thanks,

Charlie

And then geos/timeval.h checks again for _MSC_VER, and if it is not set then sys/time.h is included. I have verified this works on MSYS and MSVC++ and am planning to check the change in unless someone objects.

smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
geos-devel mailing list
geos-devel@geos.refractions.net
http://geos.refractions.net/mailman/listinfo/geos-devel