X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkpath.cc;h=3516e61318f062ecf99cdaf1ba8def46525fff84;hb=4f7187ac9efe404e0c5653fde88ebe972340e9c6;hp=c1d2bffaa0aae38e2bb888e1f2c9e630a8b6d9d7;hpb=ce1ca7d20617d7ba113d975468feff9baa419b90;p=lilypond.git

diff --git a/lily/kpath.cc b/lily/kpath.cc
index c1d2bffaa0..3516e61318 100644
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -3,12 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <stdio.h>
 #include <string.h>
 
+/*
+
+The problem, as far as I can tell, is that MacOS X has its getopt
+prototype in <unistd.h>, while I think other operating systems have it
+in other places. <unistd.h> is included by kpathsea.h, so you end up
+renaming both conflicting prototypes to YAKLUDGE.
+
+I found a somewhat more elegant patch for this: Just #include
+<unistd.h> before defining YAKLUDGE.
+
+*/
+#include <unistd.h>	
 #include "config.h"
 
 #define popen REALLYUGLYKLUDGE
@@ -26,7 +38,6 @@ extern "C" {
 #include "string.hh"
 #include "main.hh"
 #include "kpath.hh"
-#include "lily-version.hh"
 #include "warn.hh"
 
 String
@@ -55,7 +66,7 @@ ly_find_tfm (char const * name)
 {
   String p = global_path.find (String (name) + ".tfm");
 
-  if (p.length_i ())
+  if (p.length ())
     return p;
   
 #if (KPATHSEA && HAVE_KPSE_FIND_FILE)