Skip to content

Commit

Permalink
Cygwin build fix from MCA
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/geos/branches/3.0@2222 5242fede-7e19-0410-aef8-94bd7d2200fb
  • Loading branch information
pramsey committed Nov 18, 2008
1 parent 055b037 commit 54f49ac
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions source/inlines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@
// Otherwise we'll end up with duplicated symbols
#ifdef GEOS_INLINE

// If using MingW or Cygwin with GEOS_INLINE to build a DLL then Win32 gcc
// If using MingW with GEOS_INLINE to build a DLL then MingW's gcc
// has already generated the stubs for the contents of this file.
// Hence we need to supress it to avoid "multiple definition" errors
// during the final link phase
#if !(defined(__GNUC__) && defined(_WIN32)) || defined(__GNUC__) && defined(_WIN32) && !defined(DLL_EXPORT)
#if ! defined(__MINGW32__) || defined(__MINGW32__) && !defined(DLL_EXPORT)

// If using cygwin then we suppress the "multiple definition" errors by
// ignoring this section completely; the cygwin linker seems to handle
// the stubs correctly at link time by itself
#if ! defined(__CYGWIN__)


// Undefine GEOS_INLINE so that .inl files
Expand Down Expand Up @@ -57,7 +62,7 @@
#include <geos/noding/snapround/MCIndexSnapRounder.inl>
#include <geos/noding/MCIndexNoder.inl>


#endif // defined __CYGWIN__
#endif // defined __MINGW32__ and !defined DLL_EXPORT

#endif // defined GEOS_INLINE

0 comments on commit 54f49ac

Please sign in to comment.