bug 568948: building with latest MSVC

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2046 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/sdcc_vc.h b/sdcc_vc.h
index b5650ca844e90118e7179a787f05401f78f573c2..b438c0e771bb1e2aea5e23d38836caaed3bf2024 100644 (file)
--- a/sdcc_vc.h
+++ b/sdcc_vc.h
@@ -11,7 +11,9 @@
 
 /* MSVC 6 does not have __FUNCTION__ preprocessor macro defined */
 
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
 #define __FUNCTION__ __FILE__
+#endif
 
 #undef PREFIX
 #undef DATADIR

diff --git a/src/pic/genarith.c b/src/pic/genarith.c
index 797c7dfc981e6bf6721953ce9fc3307622836209..9bdf0bd306d6e7d55fce645b7fa6779fa15015d1 100644 (file)
--- a/src/pic/genarith.c
+++ b/src/pic/genarith.c
@@ -36,7 +36,7 @@
 #include "SDCCglobl.h"
 #include "newalloc.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
 #define __FUNCTION__           __FILE__
 #endif