Commits

Anton Golov  committed 11f4369

Fixed some linker issues.

  • Participants
  • Parent commits eb7de69

Comments (0)

Files changed (2)

File inc/clcpp/clcpp.h

 			mov eax, dword ptr [hash]
 			ret
 		}
-#elif defined __GNUC__
+#elif 0 // This does not work due to linker errors
 		// Somehow i think that this is going to cause linking errors...
 		// I have no idea how name mangling works on local statics, and if the compiler
 		// does not correct for it in the inline asm, this won't work --- D.L.Buunk
 			mov eax, dword ptr [type_ptr]
 			ret
 		}
-#elif defined __GNUC__
+#elif 0 // This does not work due to linker errors.
 		// Same here (see previous comment) --- D.L.Buunk
 		asm (
 		"movl $type_ptr,%%eax\n\t"

File src/clReflectUtil/SerialiseJSON.cpp

 		// Convert the double to a string on the local stack
 		char fcvt_buffer[512] = { 0 };
 		int dec = -1, sign = -1;
+#ifdef _WIN32
 		_fcvt_s(fcvt_buffer, sizeof(fcvt_buffer), decimal, 48, &dec, &sign);
+#else
+		v
+#endif
 
 		char decimal_buffer[512];
 		char* iptr = fcvt_buffer;