[Libreoffice-commits] .: desktop/unx

[Thorsten Behrens]

 desktop/unx/source/makefile.mk |    2 ++
 desktop/unx/source/start.c     |    5 +++++
 2 files changed, 7 insertions(+)

New commits:
commit a16869e2ff8a85e877f4060995937835f03a2beb
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Mar 23 16:55:57 2011 +0100

    Really disable use of pagein on Mac
    
     - there was a 2nd dir re-using that pagein object file

diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index f740086..5c5c8f3 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 1b40978..988c1c3 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)