Fix packaging and compile errors on OSX.

cups/file.c:
    - O_LARGEFILE needs to be defined as 0.

tools/testosx:
    - Make sure the preflight script doesn't error out if cupsd
      is not running.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4844 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/file.c b/cups/file.c
index 8314a62d6281e7ac0571e77de8c671b19a722b2b..2d92e627419db8700508a17e8fce6ab77114b234 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -84,7 +84,7 @@
  */
 
 #ifndef O_LARGEFILE
-#  define O_LARGEFILE
+#  define O_LARGEFILE 0
 #endif /* !O_LARGEFILE */
 
 

diff --git a/tools/testosx b/tools/testosx
index 83e26184e1fb6e46f6d5588a1282b9a124be5f44..d96e9f472cfd321d4b88af3bfbfa377858788453 100755 (executable)
--- a/tools/testosx
+++ b/tools/testosx
@@ -37,7 +37,7 @@ cp packaging/installer.tif $pkgdir/Resources/background.tif
 
 cat >$pkgdir/Resources/preflight <<EOF
 #!/bin/sh
-killall cupsd
+killall cupsd || exit 0
 EOF
 chmod 755 $pkgdir/Resources/preflight