[vlc-devel] commit: Fix struct hotkey ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan  3 16:06:55 2010 +0200| [e973801d968cf13a84e2aa74db0cada3fab74db0] | committer: Rémi Denis-Courmont 

Fix struct hotkey

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

 include/vlc_keys.h |    7 +++++++
 include/vlc_main.h |    9 +++------
 src/libvlc.c       |    1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index b630e48..46df01f 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -209,4 +209,11 @@ typedef enum vlc_key {
 
 VLC_EXPORT( vlc_key_t, vlc_GetActionId, (const char *psz_key) ) LIBVLC_USED;
 
+struct hotkey
+{
+    const char *psz_action;
+    vlc_key_t i_action;
+    uint_fast32_t i_key;
+};
+
 #endif
diff --git a/include/vlc_main.h b/include/vlc_main.h
index 44299df..841d15d 100644
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -28,6 +28,8 @@
 
 TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
 
+struct hotkey;
+
 /*****************************************************************************
  * libvlc_internal_instance_t
  *****************************************************************************
@@ -38,11 +40,6 @@ struct libvlc_int_t
     VLC_COMMON_MEMBERS
 
     /* Structure storing the action name / key associations */
-    const struct hotkey
-    {
-        const char *psz_action;
-        int i_action;
-        int i_key;
-    } *p_hotkeys;
+    const struct hotkey *p_hotkeys;
 };
 
diff --git a/src/libvlc.c b/src/libvlc.c
index 2a54c70..b04af7a 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -84,6 +84,7 @@
 #include <vlc_charset.h>
 #include <vlc_cpu.h>
 #include <vlc_url.h>
+#include <vlc_keys.h>
 
 #include "libvlc.h"