Merged revision(s) 58452-58584 from trunk/blender into soc-2013-dingto.
[blender-staging.git] / intern / cycles / util / util_view.cpp
index 2c6251b02ee0fc5a555582e4952f22b5494382bd..d9934fa1356f2e6196c37dbe043d4e70257b3b4e 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
+#include "util_opengl.h"
+#include "util_time.h"
+#include "util_view.h"
+
 #ifdef __APPLE__
 #include <GLUT/glut.h>
 #else
 #include <GL/glut.h>
 #endif
 
-#include "util_opengl.h"
-#include "util_time.h"
-#include "util_view.h"
-
 CCL_NAMESPACE_BEGIN
 
 /* structs */
@@ -55,7 +55,7 @@ static void view_display_text(int x, int y, const char *text)
 
        glRasterPos3f(x, y, 0);
 
-       for(c=text; *c != '\0'; c++)
+       for(c = text; *c != '\0'; c++)
                glutBitmapCharacter(GLUT_BITMAP_HELVETICA_10, *c);
 }
 
@@ -136,7 +136,7 @@ static void view_keyboard(unsigned char key, int x, int y)
        }
 }
 
-void view_idle()
+static void view_idle(void)
 {
        if(V.redraw) {
                V.redraw = false;