From: guigues Date: Wed, 28 Jan 2009 11:54:04 +0000 (+0000) Subject: Bug fix on windows X-Git-Tag: v0.9.1~4 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d9a9ad1dfc4015176c8e6220b56f9246e112fd87;p=bbtk.git Bug fix on windows --- diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index f7b9002..764024a 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigurationFile.cxx,v $ Language: C++ - Date: $Date: 2009/01/27 14:22:56 $ - Version: $Revision: 1.26 $ + Date: $Date: 2009/01/28 11:54:04 $ + Version: $Revision: 1.27 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -43,18 +43,7 @@ # include #endif -#if defined(MACOSX) // assume this is OSX -# include -# include // _NSGetExecutablePath : must add -framework CoreFoundation to link line -# include -# ifndef PATH_MAX -# define PATH_MAX MAXPATHLEN -# endif -#endif // MACOSX - -#ifndef PATH_MAX // If not defined yet : do it -# define PATH_MAX 2048 -#endif + namespace bbtk diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index 21fa947..7f8ed76 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkUtilities.cxx,v $ Language: C++ - Date: $Date: 2009/01/27 14:22:57 $ - Version: $Revision: 1.11 $ + Date: $Date: 2009/01/28 11:54:04 $ + Version: $Revision: 1.12 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -32,7 +32,18 @@ #include "bbtkUtilities.h" #include "bbtkMessageManager.h" - +#if defined(MACOSX) // assume this is OSX +# include +# include // _NSGetExecutablePath : must add -framework CoreFoundation to link line +# include +# ifndef PATH_MAX +# define PATH_MAX MAXPATHLEN +# endif +#endif // MACOSX + +#ifndef PATH_MAX // If not defined yet : do it +# define PATH_MAX 2048 +#endif namespace bbtk {