diff --git a/examples/farViewer/farViewer.cpp b/examples/farViewer/farViewer.cpp index 5afb3c79..7bc50ed2 100644 --- a/examples/farViewer/farViewer.cpp +++ b/examples/farViewer/farViewer.cpp @@ -42,10 +42,6 @@ GLFWwindow* g_window=0; GLFWmonitor* g_primary=0; -#if _MSC_VER - #define snprintf _snprintf -#endif - #include #include @@ -70,6 +66,12 @@ GLFWmonitor* g_primary=0; #include #include #include +#include + +#if _MSC_VER + #define snprintf _snprintf +#endif + //------------------------------------------------------------------------------ int g_level = 3, diff --git a/examples/glStencilViewer/glStencilViewer.cpp b/examples/glStencilViewer/glStencilViewer.cpp index 266e0196..ad4a2350 100644 --- a/examples/glStencilViewer/glStencilViewer.cpp +++ b/examples/glStencilViewer/glStencilViewer.cpp @@ -454,13 +454,13 @@ public: void EnableVertexAttributes( ) { - long int offset = 0; + int * offset = 0; for (AttrList::iterator i=_attrs.begin(); i!=_attrs.end(); ++i) { glEnableVertexAttribArray( i->location ); glVertexAttribPointer( i->location, i->size, - GL_FLOAT, GL_FALSE, sizeof(GLfloat) * _attrStride, (void*)offset); + GL_FLOAT, GL_FALSE, sizeof(GLfloat) * _attrStride, (GLvoid*)offset); offset += sizeof(GLfloat) * i->size; }