Browse Source

Fixed VC++ warnings.

Camilla Berglund 11 years ago
parent
commit
ebb7145ccc
3 changed files with 6 additions and 6 deletions
  1. 1 1
      deps/getopt.c
  2. 4 4
      src/win32_platform.h
  3. 1 1
      tests/empty.c

+ 1 - 1
deps/getopt.c

@@ -187,7 +187,7 @@ int getopt_long(int argc, char* const argv[], const char* optstring,
     /* If longindex is not NULL, it points to a variable which is set to the
     /* If longindex is not NULL, it points to a variable which is set to the
        index of the long option relative to longopts. */
        index of the long option relative to longopts. */
     if (longindex)
     if (longindex)
-      *longindex = (match - longopts);
+      *longindex = (int) (match - longopts);
 
 
     /* If flag is NULL, then getopt_long() shall return val.
     /* If flag is NULL, then getopt_long() shall return val.
        Otherwise, getopt_long() returns 0, and flag shall point to a variable
        Otherwise, getopt_long() returns 0, and flag shall point to a variable

+ 4 - 4
src/win32_platform.h

@@ -62,15 +62,15 @@
  #define _WIN32_WINNT 0x0501
  #define _WIN32_WINNT 0x0501
 #endif
 #endif
 
 
+#include <windows.h>
+#include <mmsystem.h>
+#include <dbt.h>
+
 #if defined(_MSC_VER)
 #if defined(_MSC_VER)
  #include <malloc.h>
  #include <malloc.h>
  #define strdup _strdup
  #define strdup _strdup
 #endif
 #endif
 
 
-#include <windows.h>
-#include <mmsystem.h>
-#include <dbt.h>
-
 
 
 //========================================================================
 //========================================================================
 // Hack: Define things that some windows.h variants don't
 // Hack: Define things that some windows.h variants don't

+ 1 - 1
tests/empty.c

@@ -75,7 +75,7 @@ int main(void)
     thrd_t thread;
     thrd_t thread;
     GLFWwindow* window;
     GLFWwindow* window;
 
 
-    srand(time(NULL));
+    srand((unsigned int) time(NULL));
 
 
     glfwSetErrorCallback(error_callback);
     glfwSetErrorCallback(error_callback);