LGPL

[vlc] / include / vlc_main.h

diff --git a/include/vlc_main.h b/include/vlc_main.h
index 44299df77333ff09640560ad8919d8645b61f383..cd2880d35c5b7c6a3ac1849a6a3bf0223ed4a489 100644 (file)
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -2,23 +2,23 @@
  * main.h: access to all program variables
  * Declaration and extern access to LibVLC instance object.
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002, 2008 the VideoLAN team
+ * Copyright (C) 1999, 2000, 2001, 2002, 2008 VLC authors and VideoLAN
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /**
@@ -26,7 +26,9 @@
  * This file defines libvlc_int_t internal libvlc instance
  */
 
-TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
+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;
 };