Windows builds failed to compile using tdmgcc4.8.1 or gcc < 4.8, Issue 2364

This commit is contained in:
Ingo 2014-05-10 13:35:53 +02:00
parent 4dac8cc93a
commit 34e93ee636

View File

@ -16,19 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef WIN32
// Desired auto detect function is Vista+
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8
#define WINVER 0x0600 // switching to WINVER for gcc 4.8.1 support on Winx64
#else
#define _WIN32_WINNT 0x0600
#endif
#include <windows.h>
#include <winnls.h>
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8
#undef WINVER
#else
#undef _WIN32_WINNT
#endif
#endif
#include <glib/gstdio.h>
#include "multilangmgr.h"
#include <cstring>
#include "../rtengine/safegtk.h"
#ifdef WIN32
// Desired auto detect function is Vista+
//#define _WIN32_WINNT 0x0600 // switching to WINVER for gcc 4.8.1 support on Winx64
#define WINVER 0x0600
#include <windows.h>
#include <winnls.h>
#undef WINVER
//#undef _WIN32_WINNT
#endif
MultiLangMgr langMgr;