Headers: use non-reserved identifiers for multi-inclusion protection

[vlc] / include / vlc / libvlc_structures.h

diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index 9c833b0b568c1a31f346f63d7b6d8cee70b9ea86..125501e4c28bed2b6f8319aa585eb8b64e26f828 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -21,30 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_STRUCTURES_H
-#define _LIBVLC_STRUCTURES_H 1
+#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
-
-#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( __MINGW32__ )
-typedef signed __int64 vlc_int64_t;
-# else
-typedef signed long long vlc_int64_t;
-#endif
+#include <stdint.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -81,7 +61,7 @@ typedef struct libvlc_exception_t
  * @{
  */
 
-typedef vlc_int64_t libvlc_time_t;
+typedef int64_t libvlc_time_t;
 
 /**@} */
 
@@ -139,16 +119,26 @@ typedef struct libvlc_media_t libvlc_media_t;
 
 typedef struct libvlc_media_player_t libvlc_media_player_t;
 
+/**
+ * Note the order of libvlc_state_t enum must match exactly the order of
+ * @see mediacontrol_PlayerStatus and @see input_state_e enums.
+ *
+ * Expected states by web plugins are:
+ * IDLE/CLOSE=0, OPENING=1, BUFFERING=2, PLAYING=3, PAUSED=4,
+ * STOPPING=5, FORWARD=6, BACKWARD=7, ENDED=8, ERROR=9
+ */
 typedef enum libvlc_state_t
 {
-    libvlc_NothingSpecial,
-    libvlc_Stopped,
+    libvlc_NothingSpecial=0,
     libvlc_Opening,
     libvlc_Buffering,
-    libvlc_Ended,
-    libvlc_Error,
     libvlc_Playing,
-    libvlc_Paused
+    libvlc_Paused,
+    libvlc_Stopped,
+    libvlc_Forward,
+    libvlc_Backward,
+    libvlc_Ended,
+    libvlc_Error
 } libvlc_state_t;
 
 /**@} */