Changeset 47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19 for com32/hdt/hdt-menu.h

Timestamp:

09/07/09 23:23:48 (3 years ago)

Author:

Pierre-Alexandre Meyer <pierre@…>

Children:

57c8555003f53800da1bb93a765d80678ae230ae

Parents:

e9069caefc1460ec7f4d058796005474c125fc61, 39758675d88eb2b0d5c64239aa5d47df61e4d106

git-committer:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-09-07T16:23:48Z-0700

Message:

Merge branch 'cmenu-video' into hdt-next

Conflicts:

com32/hdt/hdt-cli-disk.c
com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@…>

Files:

• com32/hdt/hdt-menu.h (modified) (2 diffs)

com32/hdt/hdt-menu.h

@@ -30 +30 @@
 #define DEFINE_HDT_MENU_H
 #include <stdio.h>
+#include <getkey.h>
 
 #include "menu.h"
@@ -83 +84 @@
 
 TIMEOUTCODE ontimeout();
-void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode);
+void keys_handler(t_menusystem * ms __attribute__ (( unused )), t_menuitem * mi, int scancode);
 
 // PCI Stuff