diff options
Diffstat (limited to 'xsltproc')
| -rw-r--r-- | xsltproc/Makefile.am | 2 | ||||
| -rw-r--r-- | xsltproc/Makefile.in | 16 | ||||
| -rw-r--r-- | xsltproc/testThreads.c | 2 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 18 |
4 files changed, 19 insertions, 19 deletions
diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index ad1c3dce..1a8804fc 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -41,4 +41,4 @@ xsltproc.dv: xsltproc.o tests: testThreads @echo > .memdump @echo '## Running testThreads' - @($(CHECKER) ./testThreads ; grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true) + @($(CHECKER) ./testThreads > /dev/null; grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true) diff --git a/xsltproc/Makefile.in b/xsltproc/Makefile.in index 15fb77bb..bd5caf9c 100644 --- a/xsltproc/Makefile.in +++ b/xsltproc/Makefile.in @@ -93,7 +93,7 @@ bin_PROGRAMS = xsltproc$(EXEEXT) $(XSLTPROCDV) noinst_PROGRAMS = testThreads$(EXEEXT) subdir = xsltproc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -257,7 +257,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MV = @MV@ M_LIBS = @M_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -274,6 +273,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ PYTHONSODV = @PYTHONSODV@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ @@ -283,12 +285,10 @@ PYTHON_SUBDIR = @PYTHON_SUBDIR@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RELDATE = @RELDATE@ -RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TAR = @TAR@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ @@ -307,8 +307,6 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ -XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@ -XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -396,9 +394,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xsltproc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xsltproc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu xsltproc/Makefile + $(AUTOMAKE) --foreign xsltproc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -742,7 +740,7 @@ xsltproc.dv: xsltproc.o tests: testThreads @echo > .memdump @echo '## Running testThreads' - @($(CHECKER) ./testThreads ; grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true) + @($(CHECKER) ./testThreads > /dev/null; grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xsltproc/testThreads.c b/xsltproc/testThreads.c index 05f0039c..7c226446 100644 --- a/xsltproc/testThreads.c +++ b/xsltproc/testThreads.c @@ -16,7 +16,9 @@ #include <stdlib.h> #include <stdio.h> +#ifndef _REENTRANT #define _REENTRANT +#endif #include <libxml/xmlversion.h> #if defined(LIBXML_THREAD_ENABLED) && defined(HAVE_PTHREAD_H) diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 3c83abda..d8d26698 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -31,6 +31,9 @@ #ifdef HAVE_STDARG_H #include <stdarg.h> #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +#include <fcntl.h> +#endif #include <libxml/xmlmemory.h> #include <libxml/debugXML.h> #include <libxml/HTMLtree.h> @@ -54,18 +57,11 @@ #include <libexslt/exsltconfig.h> -#if defined(WIN32) && !defined (__CYGWIN__) -#if defined(_MSC_VER) || defined(__MINGW32__) -#include <winsock2.h> -#define gettimeofday(p1,p2) -#endif /* _MS_VER */ -#else /* WIN32 */ #if defined(HAVE_SYS_TIME_H) #include <sys/time.h> #elif defined(HAVE_TIME_H) #include <time.h> #endif -#endif /* WIN32 */ #ifdef HAVE_SYS_TIMEB_H #include <sys/timeb.h> @@ -564,6 +560,10 @@ main(int argc, char **argv) srand(time(NULL)); xmlInitMemory(); +#if defined(_WIN32) && !defined(__CYGINW__) + setmode(fileno(stdout), O_BINARY); + setmode(fileno(stderr), O_BINARY); +#endif #if defined(_MSC_VER) && _MSC_VER < 1900 _set_output_format(_TWO_DIGIT_EXPONENT); #endif @@ -594,8 +594,8 @@ main(int argc, char **argv) (!strcmp(argv[i], "-output")) || (!strcmp(argv[i], "--output"))) { i++; -#if defined(WIN32) || defined (__CYGWIN__) - output = xmlCanonicPath(argv[i]); +#if defined(_WIN32) || defined (__CYGWIN__) + output = (char *) xmlCanonicPath((xmlChar *) argv[i]); if (output == NULL) #endif output = (char *) xmlStrdup((xmlChar *) argv[i]); |