Browse Source

Merge pull request #99 from fluffyfreak/nanovg_vs2013_fix

Defining round function isn't required for vs2013 or newer.
Branimir Karadžić 11 years ago
parent
commit
e0eb85462d
1 changed files with 2 additions and 0 deletions
  1. 2 0
      examples/20-nanovg/nanovg.cpp

+ 2 - 0
examples/20-nanovg/nanovg.cpp

@@ -833,10 +833,12 @@ void freeDemoData(struct NVGcontext* vg, struct DemoData* data)
 		nvgDeleteImage(vg, data->images[i]);
 		nvgDeleteImage(vg, data->images[i]);
 }
 }
 
 
+#if _MSC_VER < 1800
 inline float round(float _f)
 inline float round(float _f)
 {
 {
 	return float(int(_f) );
 	return float(int(_f) );
 }
 }
+#endif
 
 
 void drawParagraph(struct NVGcontext* vg, float x, float y, float width, float height, float mx, float my)
 void drawParagraph(struct NVGcontext* vg, float x, float y, float width, float height, float mx, float my)
 {
 {