[vlc-devel] commit: Remove recursive libvlc <-> vlc/vlc inclusion ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jun  1 10:22:29 2008 +0300| [dc902fa14a53020687df276243e532eaec407fa8]

Remove recursive libvlc <-> vlc/vlc inclusion

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

 include/vlc/libvlc.h            |   16 +++++++++++++++-
 include/vlc/libvlc_structures.h |   16 ----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 50377f7..2dbf626 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -34,7 +34,21 @@
 #ifndef _LIBVLC_H
 #define _LIBVLC_H 1
 
-#include <vlc/vlc.h>
+#if defined (WIN32) && defined (DLL_EXPORT)
+# define VLC_PUBLIC_API __declspec(dllexport)
+#else
+# define VLC_PUBLIC_API
+#endif
+
+#ifdef __LIBVLC__
+/* Avoid unuseful warnings from libvlc with our deprecated APIs */
+#   define VLC_DEPRECATED_API VLC_PUBLIC_API
+#elif defined(__GNUC__) && \
+      (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# define VLC_DEPRECATED_API VLC_PUBLIC_API __attribute__((deprecated))
+#else
+# define VLC_DEPRECATED_API VLC_PUBLIC_API
+#endif
 
 # ifdef __cplusplus
 extern "C" {
diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index a914248..56e7af7 100644
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -24,22 +24,6 @@
 #ifndef _LIBVLC_STRUCTURES_H
 #define _LIBVLC_STRUCTURES_H 1
 
-#if defined (WIN32) && defined (DLL_EXPORT)
-# define VLC_PUBLIC_API __declspec(dllexport)
-#else
-# define VLC_PUBLIC_API
-#endif
-
-#ifdef __LIBVLC__
-/* Avoid unuseful warnings from libvlc with our deprecated APIs */
-#   define VLC_DEPRECATED_API VLC_PUBLIC_API
-#elif defined(__GNUC__) && \
-      (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define VLC_DEPRECATED_API VLC_PUBLIC_API __attribute__((deprecated))
-#else
-# define VLC_DEPRECATED_API VLC_PUBLIC_API
-#endif
-
 #include <stdint.h>
 
 # ifdef __cplusplus