Patch for MSVC2013 compilation

stepcode · Jan 27, 2015 · 1054952 · 1054952
1 parent f0b2d97
commit 1054952
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/include/sc_stdbool.h b/include/sc_stdbool.h
@@ -34,7 +34,7 @@ typedef int _Bool;
  * and version 15.00.30729.01, which comes with Visual C++ 2008, do not
  * define _Bool.
  */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER<1800
 typedef int _Bool;
 #endif
 

diff --git a/src/exp2cxx/classes_attribute.c b/src/exp2cxx/classes_attribute.c
@@ -12,6 +12,7 @@ N350 ( August 31, 1993 ) of ISO 10303 TC184/SC4/WG7.
 *******************************************************************/
 #include <sc_memmgr.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
 #include <sc_mkdir.h>
 #include <ordered_attrs.h>
@@ -21,6 +22,10 @@ N350 ( August 31, 1993 ) of ISO 10303 TC184/SC4/WG7.
 
 #include <sc_trace_fprintf.h>
 
+#if defined( _WIN32 ) || defined ( __WIN32__ )
+#  define snprintf _snprintf
+#endif
+
 extern int old_accessors;
 extern int print_logging;
 

diff --git a/src/exp2cxx/selects.c b/src/exp2cxx/selects.c
@@ -1045,8 +1045,8 @@ void TYPEselect_lib_print_part_three( const Type type, FILE * f,
     /* all the items in the select type  */
     Linked_List attrs = SEL_TYPEgetnew_attribute_list( type );
     /*  list of attributes with unique names */
-    Entity ent;
-    Variable uattr;     /*  attribute in underlying type  */
+    Entity ent = NULL;
+    Variable uattr = NULL;     /*  attribute in underlying type  */
 
     fprintf( f, "\n    //  part 3\n" );