Remove recursive libvlc <-> vlc/vlc inclusion

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 50377f758f82ce2614a414add4fd1e88d743ab2e..2dbf626d4c66456b601ca409c4de83818661162a 100644 (file)
--- 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 a9142489cf144286902e3809b35a12d89bf070d9..56e7af752ee24bfd71625a4079c6b50bb3786341 100644 (file)
--- 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