From: Francesco Montorsi Date: Mon, 1 Jun 2009 12:40:50 +0000 (+0000) Subject: fix PCH-less build X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/53c2cdb0b1280582e9c95033ffac47a83e088adc fix PCH-less build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h index e803953fe2..899c044185 100644 --- a/include/wx/animdecod.h +++ b/include/wx/animdecod.h @@ -16,6 +16,7 @@ #include "wx/colour.h" #include "wx/gdicmn.h" +#include "wx/log.h" class WXDLLIMPEXP_FWD_BASE wxInputStream; class WXDLLIMPEXP_FWD_CORE wxImage; diff --git a/tests/benchmarks/printfbench.cpp b/tests/benchmarks/printfbench.cpp index 7ee4cf9314..159c29bad3 100644 --- a/tests/benchmarks/printfbench.cpp +++ b/tests/benchmarks/printfbench.cpp @@ -62,15 +62,15 @@ const wxString g_verylongString = #define DO_LONG_BENCHMARK(fnc, prefix) \ fnc(buffer, BUFSIZE, \ prefix##"This is a reasonably long string with various %s arguments, exactly %d, " \ - "and is used as benchmark for %s - %% %.2f %d %s", \ - "(many!!)", 6, "this program", 23.342f, 999, \ + prefix##"and is used as benchmark for %s - %% %.2f %d %s", \ + prefix##"(many!!)", 6, "this program", 23.342f, 999, \ (const char*)g_verylongString.c_str()); #define DO_LONG_POSITIONAL_BENCHMARK(fnc, prefix) \ fnc(buffer, BUFSIZE, \ prefix##"This is a %2$s and thus is harder to parse... let's %1$s " \ - "for our benchmarking aims - %% %3$f %5$d %4$s", \ - "test it", "string with positional arguments", 23.342f, \ + prefix##"for our benchmarking aims - %% %3$f %5$d %4$s", \ + prefix##"test it", "string with positional arguments", 23.342f, \ (const char*)g_verylongString.c_str(), 999); #define DO_BENCHMARK(fnc, prefix) \ diff --git a/tests/image/image.cpp b/tests/image/image.cpp index 80dee8376c..985a0bc984 100644 --- a/tests/image/image.cpp +++ b/tests/image/image.cpp @@ -21,7 +21,7 @@ #ifndef WX_PRECOMP #endif // WX_PRECOMP -#include "wx/bitmap.h" +#include "wx/image.h" #include "wx/url.h" #include "wx/mstream.h" #include "wx/zstream.h"