diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-23 16:55:57 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-23 16:55:57 +0100 |
| commit | 049e760f40f36b9619947a475f36a17a957276e9 (patch) | |
| tree | 8b4571c03900f8cd0e5425bc0cccf1ee24ffc7a0 /desktop/unx/source | |
| parent | 8df89e17db6ddb7899e3e3293ec6e35b2ee382a6 (diff) | |
Really disable use of pagein on Mac
- there was a 2nd dir re-using that pagein object file
Diffstat (limited to 'desktop/unx/source')
| -rwxr-xr-x | desktop/unx/source/makefile.mk | 2 | ||||
| -rwxr-xr-x | desktop/unx/source/start.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk index f7400867cab2..5c5c8f3e9e88 100755 --- a/desktop/unx/source/makefile.mk +++ b/desktop/unx/source/makefile.mk @@ -44,9 +44,11 @@ OBJFILES= \ $(OBJ)$/start.obj \ $(OBJ)$/args.obj +.IF "$(OS)"!="MACOSX" PAGEIN_OBJS= \ $(OBJ)$/pagein.obj \ $(OBJ)$/file_image_unx.obj +.ENDIF APP1TARGET = $(TARGET) APP1RPATH = BRAND diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index b571d1bd6090..5954dc344d6a 100755 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -731,6 +731,10 @@ extern int pagein_execute (int argc, char **argv); void exec_pagein (Args *args) { +// no pagein for the while on OSX +#ifdef MACOSX + (void)args; +#else char *argv[5]; rtl_String *app_path; @@ -750,6 +754,7 @@ exec_pagein (Args *args) pagein_execute (args->pPageinType ? 4 : 3, argv); free (argv[1]); +#endif } static void extend_library_path (const char *new_element) |