[vlc-commits] mingw-w64 ships guiddef.h

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov  7 19:56:46 2011 -0500| [c52e826cb67f511754d5a1fafe9fc355f4342356] | committer: Rafaël Carré

mingw-w64 ships guiddef.h

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c52e826cb67f511754d5a1fafe9fc355f4342356
---

 activex/Makefile.am |    1 -
 activex/guiddef.h   |   34 ----------------------------------
 activex/main.cpp    |   13 +++++++++++++
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 5a4bdf9..e109a0c 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -66,7 +66,6 @@ axvlc_la_SOURCES = \
     plugin.h \
     axvlc_idl.c \
     axvlc_idl.h \
-    guiddef.h \
     $(NULL)
 
 axvlc_la_DEPENDENCIES = $(srcdir)/axvlc.def $(DATA_axvlc_rc)
diff --git a/activex/guiddef.h b/activex/guiddef.h
deleted file mode 100644
index 0c82217..0000000
--- a/activex/guiddef.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * guiddef.h: ActiveX control for VLC
- *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- *
- * Authors: Damien Fouilleul <Damien.Fouilleul at laposte.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef __GUIDDEF_H__
-#define __GUIDDEF_H__
-/*
-** Widl generated code requires guiddef.h,
-** which is not available under MinGW
-*/
-#undef GUID_EXT
-#define GUID_EXT
-#include <initguid.h>
-
-#endif
-
diff --git a/activex/main.cpp b/activex/main.cpp
index 6fa8a76..1772db3 100644
--- a/activex/main.cpp
+++ b/activex/main.cpp
@@ -30,7 +30,20 @@
 #include <shlwapi.h>
 
 #include <tchar.h>
+
+#include <_mingw.h>
+#ifdef __MINGW64_VERSION_MAJOR
 #include <guiddef.h>
+#else /* ! __MINGW64_VERSION_MAJOR */
+/*
+** Widl generated code requires guiddef.h,
+** which is not available under MinGW32
+*/
+#undef GUID_EXT
+#define GUID_EXT
+#include <initguid.h>
+#endif /* __MINGW64_VERSION_MAJOR */
+
 
 using namespace std;