diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-01-13 06:28:51 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-01-13 06:28:51 +0400 |
| commit | 717bf85545989eb91d429108202294da24cbb565 (patch) | |
| tree | b58ac43b27cedb08d1cd39e47c50efb30d0d2f31 /source | |
| parent | c925b5bbb29f2a7d698037d21cdeefc8b613149b (diff) | |
Fix some harmless warnings that mostly appeared on MinGW64
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index a08103d2446..9b254107e5d 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -116,7 +116,7 @@ static void tend(void) { QueryPerformanceCounter(&liCurrentTime); } -static double tval(void) +static double UNUSED_FUNCTION(tval) (void) { return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart) * (double)1000.0 / (double)liFrequency.QuadPart)); } diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 071675c21b9..b0572156d00 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -92,7 +92,9 @@ void RegisterBlendExtension(void) const char *ThumbHandlerDLL; char RegCmd[MAX_PATH * 2]; char MBox[256]; +#ifndef WIN64 BOOL IsWOW64; +#endif printf("Registering file extension..."); GetModuleFileName(0, BlPath, MAX_PATH); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index dcd841fd363..842f1f230af 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -4136,7 +4136,6 @@ void ED_view3d_cursor3d_position(bContext *C, float fp[3], const int mval[2]) ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); - float zfac; bool flip; bool depth_used = false; @@ -4145,13 +4144,13 @@ void ED_view3d_cursor3d_position(bContext *C, float fp[3], const int mval[2]) if (rv3d == NULL) return; - zfac = ED_view3d_calc_zfac(rv3d, fp, &flip); + ED_view3d_calc_zfac(rv3d, fp, &flip); /* reset the depth based on the view offset (we _know_ the offset is infront of us) */ if (flip) { negate_v3_v3(fp, rv3d->ofs); /* re initialize, no need to check flip again */ - zfac = ED_view3d_calc_zfac(rv3d, fp, NULL /* &flip */ ); + ED_view3d_calc_zfac(rv3d, fp, NULL /* &flip */ ); } if (U.uiflag & USER_ZBUF_CURSOR) { /* maybe this should be accessed some other way */ diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 19b87766ffd..28fc222e187 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1269,7 +1269,8 @@ void WM_clipboard_text_set(const char *buf, bool selection) if (!G.background) { #ifdef _WIN32 /* do conversion from \n to \r\n on Windows */ - char *p, *p2, *newbuf; + const char *p; + char *p2, *newbuf; int newlen = 0; for (p = buf; *p; p++) { |