Author: manolo Date: 2011-03-06 08:54:58 -0800 (Sun, 06 Mar 2011) New Revision: 8511 Log: Fix STR #2582 (Mac OS): The problem: under Mac OS, file config.h can be used with distinct architectures when using configure --with-archflags option, thus file config.h should not contain architecture-dependent definitions. The fix: 1) don't use autoconf's endianness determination procedure because it can't give a result that fits both big and little endian architectures. 2) have config.h include a mac-specific file under Mac OS.
Added: branches/branch-1.3/mac_endianness.h Modified: branches/branch-1.3/configh.in branches/branch-1.3/configure.in Modified: branches/branch-1.3/configh.in =================================================================== --- branches/branch-1.3/configh.in 2011-03-06 16:37:22 UTC (rev 8510) +++ branches/branch-1.3/configh.in 2011-03-06 16:54:58 UTC (rev 8511) @@ -161,8 +161,12 @@ * * Byte order of your machine: 1 = big-endian, 0 = little-endian. */ - + +#ifdef __APPLE__ +#include <mac_endianness.h> +#else #define WORDS_BIGENDIAN 0 +#endif /* * U16, U32, U64: Modified: branches/branch-1.3/configure.in =================================================================== --- branches/branch-1.3/configure.in 2011-03-06 16:37:22 UTC (rev 8510) +++ branches/branch-1.3/configure.in 2011-03-06 16:54:58 UTC (rev 8511) @@ -427,7 +427,9 @@ AC_PATH_TOOL(RC,windres) dnl Architecture checks... -AC_C_BIGENDIAN +if test "$uname" != Darwin; then + AC_C_BIGENDIAN +fi AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(int, 4) Added: branches/branch-1.3/mac_endianness.h =================================================================== --- branches/branch-1.3/mac_endianness.h (rev 0) +++ branches/branch-1.3/mac_endianness.h 2011-03-06 16:54:58 UTC (rev 8511) @@ -0,0 +1,38 @@ +/* + * "$Id$" + * + * Mac-specific configuration file for the Fast Light Tool Kit (FLTK). + * + * Copyright 1998-2011 by Bill Spitzak and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems on the following page: + * + * http://www.fltk.org/str.php + */ + +#ifdef __APPLE__ +# ifdef __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# else +# define WORDS_BIGENDIAN 0 +# endif +#endif + +/* + * End of "$Id$". + */ Property changes on: branches/branch-1.3/mac_endianness.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
