--- ./src/engine/expr.cpp Tue Nov 6 04:56:32 2001 +++ ../Sablot-0.71/./src/engine/expr.cpp Tue Dec 11 12:20:52 2001 @@ -1053,7 +1053,7 @@ }; break; case AXIS_PRECEDING: { - v = v ? : baseV; + v = v ? v : baseV; w = S.dom().getPreviousSibling(v); if (w) { int childCount; @@ -3416,7 +3416,8 @@ if (hasPath) { filteredc.assign(newc); - E( args[argsNumber-1] -> createLPContextSum(S, filteredc = newc, (*newc).getCurrentNode()) ); + filteredc = newc; + E( args[argsNumber-1] -> createLPContextSum(S, filteredc, (*newc).getCurrentNode()) ); newc.del(); newc = filteredc.keep(); } --- ./src/engine/platform.h Fri Oct 19 04:13:19 2001 +++ ../Sablot-0.71/./src/engine/platform.h Tue Dec 11 12:29:23 2001 @@ -1,62 +1,62 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Sablotron XSLT Processor. - * - * The Initial Developer of the Original Code is Ginger Alliance Ltd. - * Portions created by Ginger Alliance are Copyright (C) 2000 Ginger - * Alliance Ltd. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -// platform.h - -#if !defined(PlatformHIncl) -#define PlatformHIncl - -// GP: clean - -// disable the "no placement delete" warning of MSVC 6 -// (MSVC 4.2 doesn't accept placement deletes) -#if defined(WIN32) -#pragma warning(disable: 4291) -// some more warnings we don't care about -#pragma warning(disable: 4514 4100 4512) -#endif - -extern int isnan__(double x); -extern int isinf__(double x); -extern double getMillisecs(); - -class DStr; -void my_getcwd(DStr &dir); - -#endif - -#if defined(WIN32) -#define snprintf _snprintf -#define strncasecmp _strnicmp -#else -#include // definition of strncasecmp -#endif +/* + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is the Sablotron XSLT Processor. + * + * The Initial Developer of the Original Code is Ginger Alliance Ltd. + * Portions created by Ginger Alliance are Copyright (C) 2000 Ginger + * Alliance Ltd. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU General Public License Version 2 or later (the + * "GPL"), in which case the provisions of the GPL are applicable + * instead of those above. If you wish to allow use of your + * version of this file only under the terms of the GPL and not to + * allow others to use your version of this file under the MPL, + * indicate your decision by deleting the provisions above and + * replace them with the notice and other provisions required by + * the GPL. If you do not delete the provisions above, a recipient + * may use your version of this file under either the MPL or the + * GPL. + */ + +// platform.h + +#if !defined(PlatformHIncl) +#define PlatformHIncl + +// GP: clean + +// disable the "no placement delete" warning of MSVC 6 +// (MSVC 4.2 doesn't accept placement deletes) +#if defined(WIN32) +#pragma warning(disable: 4291) +// some more warnings we don't care about +#pragma warning(disable: 4514 4100 4512) +#endif + +extern int isnan__(double x); +extern int isinf__(double x); +extern double getMillisecs(); + +class DStr; +void my_getcwd(DStr &dir); + +#endif + +#if defined(WIN32) +#define snprintf _snprintf +#define strncasecmp _strnicmp +#else +#include // definition of strncasecmp +#endif --- ./tools/ltconfig Thu Jul 13 14:54:59 2000 +++ ../Sablot-0.71/./tools/ltconfig Tue Dec 11 20:02:37 2001 @@ -852,7 +852,7 @@ rmdir conftest $rm -r conftest 2>/dev/null -if test x"$compiler_c_o" = x"yes"; then +if test x"$compiler_c_o" = x"yes" && test x"$compiler_o_lo" != x"no" ; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6 $rm conftest* --- ./configure Mon Nov 5 06:03:00 2001 +++ ../Sablot-0.71/./configure Tue Dec 11 20:01:33 2001 @@ -1446,6 +1446,7 @@ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +compiler_o_lo="no" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ @@ -2109,7 +2110,7 @@ panic=0 if test $xmle = 1; then resmsg='expat (new)' -elif $xmlp = 1; then +elif test $xmlp = 1; then resmsg='expat (old)' else resmsg='not found (panic)'