Remove recursive libvlc <-> vlc/vlc inclusion

dc902fa1 · Rémi Denis-Courmont · 92fd4328 · dc902fa1 · dc902fa1
Commit dc902fa1 authored Jun 01, 2008 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 17 deletions

include/vlc/libvlc.h include/vlc/libvlc.h +15 -1

include/vlc/libvlc_structures.h include/vlc/libvlc_structures.h +0 -16

No files found.
--- 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" {

--- 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