]>
Commit | Line | Data |
---|---|---|
14775208 JB |
1 | --- XaoS/src/ui/ui-drv/ggi/ui_ggi.c.orig 2002-09-25 17:52:09.000000000 +0200 |
2 | +++ XaoS/src/ui/ui-drv/ggi/ui_ggi.c 2006-10-19 21:11:26.283841500 +0200 | |
55ed65e5 JB |
3 | @@ -1,4 +1,4 @@ |
4 | -#include "aconfig.h" | |
5 | +#include "config.h" | |
6 | #ifdef GGI_DRIVER | |
7 | /*includes */ | |
8 | #include <sys/time.h> | |
14775208 | 9 | @@ -332,7 +332,7 @@ |
55ed65e5 JB |
10 | #ifdef GIIK_Delete |
11 | case GIIK_Delete: | |
12 | #endif | |
13 | -#ifdef GIIUC_Delete | |
14 | +#if defined(GIIUC_Delete) && ((!defined(GIIK_Delete)) || (GIIUC_Delete != GIIK_Delete)) | |
15 | case GIIUC_Delete: | |
16 | #endif | |
17 | case GIIUC_BackSpace: | |
14775208 JB |
18 | @@ -397,7 +397,7 @@ |
19 | "32", | |
20 | NULL | |
21 | }; | |
22 | -static CONST menudialog uih_resizedialog[] = { | |
23 | +static menudialog uih_resizedialog[] = { | |
24 | DIALOGINT ("X:", 0), | |
25 | DIALOGINT ("Y:", 0), | |
26 | DIALOGCHOICE ("Depth", names, 0), |