Ticket #261: fontconfig-2.8.0.patch

fontconfig-2.8.

@@ -150 +150 @@
 /* Can use #warning in C files */
 #undef HAVE_WARNING_CPP_DIRECTIVE
 
+/* Compiling for Haiku */
+#undef HAIKU
+
 /* Use xmlparse.h instead of expat.h */
 #undef HAVE_XMLPARSE_H
 

fontconfig-2.8.

@@ -71 +71 @@
 case "$host" in
   *-*-mingw*)
     os_win32=yes
+    os_haiku=no
+    ;;
+  *-*-haiku*)
+    os_win32=no
+    os_haiku=yes
     ;;
   *)
     os_win32=no
+    os_haiku=no
 esac
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
@@ -82 +88 @@
 fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 
+if test "$os_haiku" = "yes"; then
+  AC_DEFINE(HAIKU)
+fi
+
 WARN_CFLAGS=""
 if test "x$GCC" = "xyes"; then
         WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \

src/fcatomic.c

@@ -104 +104 @@
     int         ret;
     struct stat lck_stat;
 
-#ifdef HAVE_LINK
+#if defined (HAVE_LINK) && !defined (HAIKU)
     strcpy ((char *) atomic->tmp, (char *) atomic->file);
     strcat ((char *) atomic->tmp, TMP_NAME);
     fd = mkstemp ((char *) atomic->tmp);
@@ -147 +147 @@
             time_t  now = time (0);
             if ((long int) (now - lck_stat.st_mtime) > 10 * 60)
             {
-#ifdef HAVE_LINK
+#if defined (HAVE_LINK) && !defined (HAIKU)
                 if (unlink ((char *) atomic->lck) == 0)
                     return FcAtomicLock (atomic);
 #else
@@ -194 +194 @@
 void
 FcAtomicUnlock (FcAtomic *atomic)
 {
-#ifdef HAVE_LINK
+#if defined (HAVE_LINK) && !defined (HAIKU)
     unlink ((char *) atomic->lck);
 #else
     rmdir ((char *) atomic->lck);