Created
August 21, 2012 20:56
-
-
Save ummels/3419350 to your computer and use it in GitHub Desktop.
Patch for compiling FontForge under OS X 10.7
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/fontforge/macbinary.c b/fontforge/macbinary.c | |
index a452d5b..d90f567 100644 | |
--- a/fontforge/macbinary.c | |
+++ b/fontforge/macbinary.c | |
@@ -37,7 +37,7 @@ | |
#include "psfont.h" | |
#if __Mac | |
# include <ctype.h> | |
-# include </Developer/Headers/FlatCarbon/Files.h> | |
+# include <CoreServices/CoreServices.h> | |
#else | |
# include <utype.h> | |
#undef __Mac | |
diff --git a/fontforge/startui.c b/fontforge/startui.c | |
index 6eb9a62..f44f4c9 100644 | |
--- a/fontforge/startui.c | |
+++ b/fontforge/startui.c | |
@@ -47,10 +47,10 @@ | |
# endif | |
#endif | |
#ifdef __Mac | |
-# include </Developer/Headers/FlatCarbon/Files.h> | |
+# include <CoreServices/CoreServices.h> | |
# define FontInfo MacFontInfo | |
# define KernPair MacKernPair | |
-# include </Developer/Headers/FlatCarbon/CarbonEvents.h> | |
+# include <Carbon/Carbon.h> | |
/* For reasons obscure to me RunApplicationEventLoop is not defined in */ | |
/* the mac header files if we are in 64 bit mode. Strangely it seems to */ | |
/* be in the libraries and functional */ | |
diff --git a/gutils/giomime.c b/gutils/giomime.c | |
index 9eb280b..177a7a3 100644 | |
--- a/gutils/giomime.c | |
+++ b/gutils/giomime.c | |
@@ -65,7 +65,7 @@ unichar_t fontpcf[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-', | |
unichar_t fontsnf[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','f','o','n','t','-','s','n','f', '\0' }; | |
#ifdef __Mac | |
-#include </Developer/Headers/FlatCarbon/Files.h> | |
+#include <CoreServices/CoreServices.h> | |
#define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4)) | |
unichar_t *_GioMacMime(const char *path) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment