Revision: 22436
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22436
Author: elubie
Date: 2009-08-13 20:26:15 +0200 (Thu, 13 Aug 2009)
Log Message:
-----------
MSVC compile fix.
* replaced snprintf with BLI_snprintf
* in unit.c used the #define hack used in several places already to avoid
adding additional dependency.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
branches/blender2.5/blender/source/blender/editors/interface/interface.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
2009-08-13 17:05:27 UTC (rev 22435)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
2009-08-13 18:26:15 UTC (rev 22436)
@@ -27,6 +27,10 @@
#include <string.h>
#include <math.h>
+#if defined(WIN32) && (!(defined snprintf))
+#define snprintf _snprintf
+#endif
+
#define TEMP_STR_SIZE 256
/* define a single unit */
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-08-13 17:05:27 UTC (rev 22435)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-08-13 18:26:15 UTC (rev 22436)
@@ -1876,7 +1876,7 @@
else if(ui_is_but_unit(but)) {
char new_str[sizeof(but->drawstr)];
ui_get_but_string_unit(but, new_str,
sizeof(new_str), value, TRUE);
- snprintf(but->drawstr, sizeof(but->drawstr),
"%s%s", but->str, new_str);
+ BLI_snprintf(but->drawstr,
sizeof(but->drawstr), "%s%s", but->str, new_str);
}
else if(but->a2) { /* amount of digits defined */
if(but->a2==1) sprintf(but->drawstr, "%s%.1f",
but->str, value);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
