38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 805166411d6326ef68691e3c03922a15ab3f6ba3 Mon Sep 17 00:00:00 2001
|
|
From: Luigi 'Comio' Mantellini <luigi.mantellini@gmail.com>
|
|
Date: Mon, 24 Mar 2014 13:40:42 +0100
|
|
Subject: [PATCH] MinGW doesn't implement a wide character startup module. Use
|
|
standard main() call instead.
|
|
|
|
---
|
|
Util/include/Poco/Util/Application.h | 2 +-
|
|
Util/include/Poco/Util/ServerApplication.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h
|
|
index 9078092..dcca468 100644
|
|
--- a/Util/include/Poco/Util/Application.h
|
|
+++ b/Util/include/Poco/Util/Application.h
|
|
@@ -490,7 +490,7 @@ inline Poco::Timespan Application::uptime() const
|
|
//
|
|
// Macro to implement main()
|
|
//
|
|
-#if defined(_WIN32) && defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
|
|
+#if (defined(_WIN32) || defined(_WIN64)) && defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) && !defined(__MINGW32__)
|
|
#define POCO_APP_MAIN(App) \
|
|
int wmain(int argc, wchar_t** argv) \
|
|
{ \
|
|
diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
|
|
index 1b9bf82..6b94dc0 100644
|
|
--- a/Util/include/Poco/Util/ServerApplication.h
|
|
+++ b/Util/include/Poco/Util/ServerApplication.h
|
|
@@ -246,7 +246,7 @@ class Util_API ServerApplication: public Application
|
|
//
|
|
// Macro to implement main()
|
|
//
|
|
-#if defined(_WIN32) && defined(POCO_WIN32_UTF8)
|
|
+#if defined(_WIN32) && defined(POCO_WIN32_UTF8) && !defined(__MINGW32__)
|
|
#define POCO_SERVER_MAIN(App) \
|
|
int wmain(int argc, wchar_t** argv) \
|
|
{ \
|