[Cogl] [PATCH ] Fix the pre-defined cogl-defines.h

[Fan Chun-wei]

...for the Visual Studio builds, so that:
-They can reflect the ones given in the autotools builds more accurately
-The will "#define COGL_HAS_GTYPE_SUPPORT 1", as currently all Visual
  Studio builds are linked to an existing installation of GLib
-They will have the correct versioning info
---
  cogl/cogl-defines.h.win32.in     |   15 +++++----------
  cogl/cogl-defines.h.win32_SDL.in |   15 +++++----------
  2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/cogl/cogl-defines.h.win32.in b/cogl/cogl-defines.h.win32.in
index da9cc5f..2ee5d89 100644
--- a/cogl/cogl-defines.h.win32.in
+++ b/cogl/cogl-defines.h.win32.in
@@ -28,11 +28,8 @@
  #ifndef __COGL_DEFINES_H__
  #define __COGL_DEFINES_H__

-#include <glib.h>
-
-G_BEGIN_DECLS
-
  #define COGL_HAS_GLIB_SUPPORT 1
+#define COGL_HAS_GTYPE_SUPPORT 1
  #define COGL_HAS_WGL_SUPPORT 1
  #define COGL_HAS_WIN32_SUPPORT 1
  #define COGL_HAS_GL 1
@@ -60,11 +57,9 @@ G_BEGIN_DECLS
  #define COGL_SYSDEF_POLLHUP 16
  #define COGL_SYSDEF_POLLNVAL 32

-#define COGL_VERSION_MAJOR_INTERNAL @COGL_MAJOR_VERSION@
-#define COGL_VERSION_MINOR_INTERNAL @COGL_MINOR_VERSION@
-#define COGL_VERSION_MICRO_INTERNAL @COGL_MICRO_VERSION@
-#define COGL_VERSION_STRING_INTERNAL "@COGL_VERSION@"
-
-G_END_DECLS
+#define COGL_VERSION_MAJOR_INTERNAL 1
+#define COGL_VERSION_MINOR_INTERNAL @COGL_1_MINOR_VERSION@
+#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@
+#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@"

  #endif
diff --git a/cogl/cogl-defines.h.win32_SDL.in 
b/cogl/cogl-defines.h.win32_SDL.in
index dc9ea5d..7e8e2a2 100644
--- a/cogl/cogl-defines.h.win32_SDL.in
+++ b/cogl/cogl-defines.h.win32_SDL.in
@@ -28,11 +28,8 @@
  #ifndef __COGL_DEFINES_H__
  #define __COGL_DEFINES_H__

-#include <glib.h>
-
-G_BEGIN_DECLS
-
  #define COGL_HAS_GLIB_SUPPORT 1
+#define COGL_HAS_GTYPE_SUPPORT 1
  #define COGL_HAS_WGL_SUPPORT 1
  #define COGL_HAS_WIN32_SUPPORT 1
  #define COGL_HAS_SDL_SUPPORT 1
@@ -61,11 +58,9 @@ G_BEGIN_DECLS
  #define COGL_SYSDEF_POLLHUP 16
  #define COGL_SYSDEF_POLLNVAL 32

-#define COGL_VERSION_MAJOR_INTERNAL @COGL_MAJOR_VERSION@
-#define COGL_VERSION_MINOR_INTERNAL @COGL_MINOR_VERSION@
-#define COGL_VERSION_MICRO_INTERNAL @COGL_MICRO_VERSION@
-#define COGL_VERSION_STRING_INTERNAL "@COGL_VERSION@"
-
-G_END_DECLS
+#define COGL_VERSION_MAJOR_INTERNAL 1
+#define COGL_VERSION_MINOR_INTERNAL @COGL_1_MINOR_VERSION@
+#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@
+#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@"

  #endif
-- 
1.7.7.1.msysgit.0