From 14f943cc327c97a6d4204020fc902752882629da Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 22 Nov 2005 09:47:18 +0000 Subject: [PATCH] From Marco Jez, fix for wchar_t being redefined. --- include/osg/GL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/osg/GL b/include/osg/GL index 717223a55..836caccfc 100644 --- a/include/osg/GL +++ b/include/osg/GL @@ -79,7 +79,7 @@ #endif // XXX This is from Win32's - #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&(__GNUC__ == 3)) + #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&((__GNUC__ == 3)||(__GNUC__ == 4))) typedef unsigned short wchar_t; #define _WCHAR_T_DEFINED #endif