diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-01-28 09:30:12 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-01-28 09:52:20 -0500 |
| commit | 31c768863403d50f7682ecbb7f72a4486de0e503 (patch) | |
| tree | d8552410178c7c799302f80984832f733abcf3cc /src | |
| parent | c5d1a5d8f898bf22c6bbc98f1d484b07706c035b (diff) | |
some fixes for win32, including ability to "make check" win32 builds via wine
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/Makefile.am | 8 | ||||
| -rw-r--r-- | src/util/statistics_registry.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 952951655..64a43eb02 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -41,9 +41,9 @@ pcvc4_LDADD += $(BOOST_THREAD_LIBS) -lpthread pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS) if STATIC_BINARY -pcvc4_LINK = $(CXXLINK) -all-static +pcvc4_LINK = $(CXXLINK) -all-static $(pcvc4_LDFLAGS) else -pcvc4_LINK = $(CXXLINK) +pcvc4_LINK = $(CXXLINK) $(pcvc4_LDFLAGS) endif endif @@ -87,8 +87,8 @@ clean-local: rm -f $(BUILT_SOURCES) if STATIC_BINARY -cvc4_LINK = $(CXXLINK) -all-static +cvc4_LINK = $(CXXLINK) -all-static $(cvc4_LDFLAGS) else -cvc4_LINK = $(CXXLINK) +cvc4_LINK = $(CXXLINK) $(cvc4_LDFLAGS) endif diff --git a/src/util/statistics_registry.h b/src/util/statistics_registry.h index 9aca3cb5a..32aa33bed 100644 --- a/src/util/statistics_registry.h +++ b/src/util/statistics_registry.h @@ -42,8 +42,6 @@ namespace CVC4 { class ExprManager; class SmtEngine; -inline std::ostream& operator<<(std::ostream& os, const timespec& t); - /** * The base class for all statistics. * @@ -620,6 +618,8 @@ public: /* Some utility functions for timespec */ /****************************************************************************/ +inline std::ostream& operator<<(std::ostream& os, const timespec& t); + /** Compute the sum of two timespecs. */ inline timespec& operator+=(timespec& a, const timespec& b) { // assumes a.tv_nsec and b.tv_nsec are in range |