From 9695761cfeadfcb96baa43932736a64042a36e47 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Mon, 16 Jul 2012 06:09:41 +0200
Subject: [PATCH] (PS3) Fix build on PS3

---
 gfx/gfx_common.c    |  5 ++++-
 ps3/frontend/menu.h | 18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gfx/gfx_common.c b/gfx/gfx_common.c
index 2c89e2dc9a..87b95c9ac1 100644
--- a/gfx/gfx_common.c
+++ b/gfx/gfx_common.c
@@ -25,6 +25,10 @@
 #endif
 #endif
 
+#ifdef __CELLOS_LV2__
+#include <sys/sys_time.h>
+#endif
+
 #if defined(__CELLOS_LV2__) || defined(_MSC_VER)
 static int gettimeofday(struct timeval *val, void *dummy)
 {
@@ -36,7 +40,6 @@ static int gettimeofday(struct timeval *val, void *dummy)
 #endif
 
 #if defined(__CELLOS_LV2__)
-#include <sys/sys_time.h>
    uint64_t usec = sys_time_get_system_time();
 #else
    uint64_t usec = msec * 1000;
diff --git a/ps3/frontend/menu.h b/ps3/frontend/menu.h
index 12779e93b0..f1aa52e8d9 100644
--- a/ps3/frontend/menu.h
+++ b/ps3/frontend/menu.h
@@ -21,7 +21,7 @@
 
 typedef struct
 {
-   unsigned enum_id;			/* enum ID of item				*/
+   unsigned char enum_id;		/* enum ID of item				*/
    char text[256];			/* item label					*/
    char setting_text[256];		/* setting label				*/
    float text_xpos;			/* text X position (upper left corner)		*/
@@ -30,18 +30,18 @@ typedef struct
    char comment[256];			/* item comment					*/
    unsigned item_color;			/* color of item 				*/
    float comment_ypos;			/* comment Y position (upper left corner)	*/
-   unsigned page;			/* page						*/
+   unsigned char page;			/* page						*/
 } item;
 
 typedef struct
 {
-   char title[64];			/* menu title					*/
-   unsigned enum_id;			/* enum ID of menu				*/
-   unsigned selected;			/* index of selected item			*/
-   unsigned page;			/* page						*/
-   unsigned first_setting;		/* first setting				*/
-   unsigned max_settings;		/* max no of settings in menu			*/
-   unsigned category_id;                /* category ID                                  */
+   char title[64];
+   unsigned char enum_id;
+   unsigned char selected;
+   unsigned char page;
+   unsigned char first_setting;
+   unsigned char max_settings;
+   unsigned char category_id;
 } menu;
 
 enum