SF.net SVN: gar:[26617] csw/mgar/pkg/subversion/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Feb 10 13:17:00 CET 2020
Revision: 26617
http://sourceforge.net/p/gar/code/26617
Author: dmichelsen
Date: 2020-02-10 12:17:00 +0000 (Mon, 10 Feb 2020)
Log Message:
-----------
subversion/trunk: Update to 1.13.0
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
csw/mgar/pkg/subversion/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/subversion/trunk/files/0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2020-02-05 13:33:49 UTC (rev 26616)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2020-02-10 12:17:00 UTC (rev 26617)
@@ -20,7 +20,7 @@
# http://subversion.apache.org/mailing-lists.html
NAME = subversion
-VERSION = 1.9.7
+VERSION = 1.13.0
GARTYPE = v2
DESCRIPTION = Version control rethought
@@ -45,10 +45,13 @@
PATCHFILES += 0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch
+# Use '__restrict' instead of 'restrict' when compiling the Java plugin with C++
+PATCHFILES += 0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch
+
VENDOR_URL = http://subversion.apache.org
LICENSE = LICENSE
-PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
EXTRA_MODULATORS += PYTHON_VERSION
@@ -65,7 +68,6 @@
PACKAGES += CSWsubversion
SPKG_DESC_CSWsubversion = Version control rethought
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsasl2-2
RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0
@@ -75,7 +77,6 @@
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-repos1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-client1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-ra-svn1-0
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs-fs1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-wc1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-diff1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0
@@ -118,14 +119,16 @@
PACKAGES += CSWlibsvn-auth-gnome-keyring1-0
SPKG_DESC_CSWlibsvn-auth-gnome-keyring1-0 = Subversion library libsvn_auth_gnome_keyring-1.so.0
PKGFILES_CSWlibsvn-auth-gnome-keyring1-0 += $(call pkgfiles_lib,libsvn_auth_gnome_keyring-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsecret1-0
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWglib2
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL))
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL)-$(GARCH))
@@ -135,6 +138,7 @@
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-ra1-0
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-wc1-0
@@ -150,7 +154,6 @@
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL))
@@ -213,6 +216,7 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-fs-util1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10-sparc += CSWlibmagic1
@@ -258,8 +262,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL))
@@ -315,6 +319,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibutf8proc2
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWliblz4-1
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.10 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibapr1-0
@@ -364,6 +370,7 @@
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWjavasvn-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWjavasvn-5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWjavasvn-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-ra1-0
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-repos1-0
@@ -374,12 +381,13 @@
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GAROSREL)-$(GARCH))
RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH))
# This would go away when -norunpath would make it to the linker, but at this point this is difficult.
# Override for now as it is not harmful.
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0
PACKAGES += CSWpm-subversion
SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding
@@ -419,6 +427,7 @@
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrb-subversion-5.9 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWrb-subversion-5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWrb-subversion-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-ra1-0
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-repos1-0
@@ -456,6 +465,7 @@
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH))
CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
@@ -494,6 +504,8 @@
EXTRA_LIB += $(SVNLIB)
EXTRA_LINKER_FLAGS = -lintl -liconv
+EXTRA_CPPFLAGS += -D_XPG6 -D_STDC_C99=
+
# Only add $ISALIST to dirs which ship optimized versions (done by explicitly
# excluding those lib dirs which are known not to ship optimized versions).
RUNPATH_ISALIST = $(libdir)
@@ -521,7 +533,8 @@
# This is now the default and makes building the language integrations for Perl etc. easier
#GARCOMPILER = GCC4
GARCOMPILER-5.9 = SOS12
-GARCOMPILER-5.10 = SOS12U3
+# We need __restrict for javahl
+GARCOMPILER-5.10 = SOS12U6
GARCOMPILER += $(GARCOMPILER-$(GAROSREL))
# There are lots of failing tests, needs more work
@@ -656,7 +669,8 @@
-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=sparc (.*)!$$1 -mcpu=v9 -Wa,-xarch=v8plus $$2!;' \
-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=386 +-mt(.*)!$$1 -m32 -march=i386 $$2!;' \
-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1 -mcpu=v8 $$2!;' \
- -e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \
+ -e 's,/opt/developerstudio12.6/bin/cc,/opt/csw/bin/gcc-5.5,g;' \
+ -e 's,/opt/csw/bin/gcc-5.2,/opt/csw/bin/gcc-5.5,g;' \
-e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \
-e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/libsvn,;' \
-e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/svn,;' \
@@ -665,6 +679,7 @@
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)
#@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py
cd $(WORKSRC) && cp libtool.suncc libtool
+ @$(MAKECOOKIE)
svn-perl:
@echo " ==> Building Perl bindings"
@@ -673,6 +688,7 @@
$(WORKSRC)/subversion/bindings/swig/perl/native/*.pm
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-pl
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl
+ @$(MAKECOOKIE)
svn-ruby:
@echo " ==> Building Ruby bindings"
@@ -679,6 +695,7 @@
touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-rb
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-rb
+ @$(MAKECOOKIE)
svn-java: EXTRA_LINKER_FLAGS += -norunpath
svn-java:
@@ -686,6 +703,7 @@
touch $(WORKSRC)/subversion/bindings/javahl/native/*.c
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) javahl;
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-javahl;
+ @$(MAKECOOKIE)
#post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P)
Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums 2020-02-05 13:33:49 UTC (rev 26616)
+++ csw/mgar/pkg/subversion/trunk/checksums 2020-02-10 12:17:00 UTC (rev 26617)
@@ -1 +1 @@
-05b0c677681073920f938c1f322e0be2 subversion-1.9.7.tar.bz2
+3004b4dae18bf45a0b6ea4ef8820064d subversion-1.13.0.tar.bz2
Added: csw/mgar/pkg/subversion/trunk/files/0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch 2020-02-10 12:17:00 UTC (rev 26617)
@@ -0,0 +1,1417 @@
+From 368a063500b28a915572ba7c3151cfdda5c43864 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 Feb 2020 11:29:04 +0100
+Subject: [PATCH] During inclusion of stdio.h there is sys/feature_tests.h
+ included. The problem is that C++ requires __restrict instead of restrict as
+ described in the docs at
+ https://docs.oracle.com/cd/E77782_01/html/E77789/gquig.html As we cannot hook
+ in between the inclusion of feature_tests.h and stdio.h we trick the system
+ by including feature_tests.h first which is included only once and doing the
+ fixing after our forced inclusion.
+
+---
+ subversion/bindings/javahl/native/Array.h | 4 ++++
+ subversion/bindings/javahl/native/AuthnCallback.cpp | 4 ++++
+ subversion/bindings/javahl/native/BlameCallback.h | 4 ++++
+ subversion/bindings/javahl/native/ChangelistCallback.h | 4 ++++
+ subversion/bindings/javahl/native/ClientContext.cpp | 4 ++++
+ subversion/bindings/javahl/native/CommitCallback.h | 4 ++++
+ subversion/bindings/javahl/native/CommitEditor.h | 4 ++++
+ subversion/bindings/javahl/native/CommitMessage.h | 4 ++++
+ subversion/bindings/javahl/native/CopySources.cpp | 4 ++++
+ subversion/bindings/javahl/native/CreateJ.cpp | 4 ++++
+ subversion/bindings/javahl/native/Credential.hpp | 4 ++++
+ subversion/bindings/javahl/native/DiffOptions.h | 4 ++++
+ subversion/bindings/javahl/native/DiffSummaryReceiver.cpp | 4 ++++
+ subversion/bindings/javahl/native/EditorCallbacks.hpp | 4 ++++
+ subversion/bindings/javahl/native/EditorProxy.cpp | 5 +++++
+ subversion/bindings/javahl/native/EnumMapper.cpp | 4 ++++
+ subversion/bindings/javahl/native/File.cpp | 4 ++++
+ subversion/bindings/javahl/native/ImportFilterCallback.h | 4 ++++
+ subversion/bindings/javahl/native/InfoCallback.h | 4 ++++
+ subversion/bindings/javahl/native/InputStream.h | 4 ++++
+ subversion/bindings/javahl/native/Iterator.h | 4 ++++
+ subversion/bindings/javahl/native/JNIByteArray.h | 4 ++++
+ subversion/bindings/javahl/native/JNICriticalSection.h | 4 ++++
+ subversion/bindings/javahl/native/JNIMutex.h | 4 ++++
+ subversion/bindings/javahl/native/JNIStackElement.h | 4 ++++
+ subversion/bindings/javahl/native/JNIStringHolder.cpp | 4 ++++
+ subversion/bindings/javahl/native/JNIUtil.cpp | 4 ++++
+ subversion/bindings/javahl/native/JNIUtil.h | 5 +++++
+ subversion/bindings/javahl/native/ListCallback.h | 4 ++++
+ subversion/bindings/javahl/native/LockTokenTable.h | 4 ++++
+ subversion/bindings/javahl/native/LogMessageCallback.h | 4 ++++
+ subversion/bindings/javahl/native/MessageReceiver.h | 4 ++++
+ subversion/bindings/javahl/native/NativeStream.hpp | 4 ++++
+ subversion/bindings/javahl/native/OperationContext.cpp | 4 ++++
+ subversion/bindings/javahl/native/OutputStream.h | 4 ++++
+ subversion/bindings/javahl/native/PatchCallback.h | 4 ++++
+ subversion/bindings/javahl/native/Path.cpp | 4 ++++
+ subversion/bindings/javahl/native/Pool.h | 4 ++++
+ subversion/bindings/javahl/native/Prompter.h | 4 ++++
+ subversion/bindings/javahl/native/PropertyTable.h | 4 ++++
+ subversion/bindings/javahl/native/ProplistCallback.h | 4 ++++
+ subversion/bindings/javahl/native/RemoteSession.cpp | 4 ++++
+ subversion/bindings/javahl/native/RemoteSession.h | 4 ++++
+ subversion/bindings/javahl/native/RemoteSessionContext.h | 4 ++++
+ subversion/bindings/javahl/native/ReposFreezeAction.h | 4 ++++
+ subversion/bindings/javahl/native/ReposNotifyCallback.h | 4 ++++
+ subversion/bindings/javahl/native/ReposVerifyCallback.h | 4 ++++
+ subversion/bindings/javahl/native/Revision.h | 4 ++++
+ subversion/bindings/javahl/native/RevisionRange.cpp | 4 ++++
+ subversion/bindings/javahl/native/RevisionRange.h | 4 ++++
+ subversion/bindings/javahl/native/RevisionRangeList.h | 4 ++++
+ subversion/bindings/javahl/native/SVNBase.h | 4 ++++
+ subversion/bindings/javahl/native/SVNClient.cpp | 4 ++++
+ subversion/bindings/javahl/native/SVNClient.h | 5 +++++
+ subversion/bindings/javahl/native/SVNRepos.h | 4 ++++
+ subversion/bindings/javahl/native/StateReporter.cpp | 4 ++++
+ subversion/bindings/javahl/native/StateReporter.h | 4 ++++
+ subversion/bindings/javahl/native/StatusCallback.h | 4 ++++
+ subversion/bindings/javahl/native/StringArray.h | 4 ++++
+ subversion/bindings/javahl/native/SubversionException.hpp | 4 ++++
+ subversion/bindings/javahl/native/Targets.h | 4 ++++
+ subversion/bindings/javahl/native/Utility.cpp | 4 ++++
+ subversion/bindings/javahl/native/deprecated.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_base.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_list.cpp | 4 ++++
+ subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_NativeResources.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_SVNClient.cpp | 4 ++++
+ .../bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_remote_CommitEditor.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_remote_RemoteFactory.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_remote_RemoteSession.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_remote_StateReporter.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_types_RevisionRangeList.cpp | 3 +++
+ .../native/org_apache_subversion_javahl_types_RuntimeVersion.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_types_Version.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_types_VersionExtended.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_util_PropLib.cpp | 4 ++++
+ .../javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp | 4 ++++
+ .../native/org_apache_subversion_javahl_util_TunnelChannel.cpp | 4 ++++
+ 87 files changed, 350 insertions(+)
+
+diff --git a/subversion/bindings/javahl/native/Array.h b/subversion/bindings/javahl/native/Array.h
+index 7d416fe..fa23485 100644
+--- a/subversion/bindings/javahl/native/Array.h
++++ b/subversion/bindings/javahl/native/Array.h
+@@ -27,6 +27,10 @@
+ #ifndef ARRAY_H
+ #define ARRAY_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+
+diff --git a/subversion/bindings/javahl/native/AuthnCallback.cpp b/subversion/bindings/javahl/native/AuthnCallback.cpp
+index 3a25e04..7830c4d 100644
+--- a/subversion/bindings/javahl/native/AuthnCallback.cpp
++++ b/subversion/bindings/javahl/native/AuthnCallback.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_base64.h"
+ #include "svn_x509.h"
+
+diff --git a/subversion/bindings/javahl/native/BlameCallback.h b/subversion/bindings/javahl/native/BlameCallback.h
+index 4ed9714..a3ac94f 100644
+--- a/subversion/bindings/javahl/native/BlameCallback.h
++++ b/subversion/bindings/javahl/native/BlameCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef BLAMECALLBACK_H
+ #define BLAMECALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/ChangelistCallback.h b/subversion/bindings/javahl/native/ChangelistCallback.h
+index b6b8e18..d4e57a7 100644
+--- a/subversion/bindings/javahl/native/ChangelistCallback.h
++++ b/subversion/bindings/javahl/native/ChangelistCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef CHANGELISTCALLBACK_H
+ #define CHANGELISTCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/ClientContext.cpp b/subversion/bindings/javahl/native/ClientContext.cpp
+index c9f327b..5a83a59 100644
+--- a/subversion/bindings/javahl/native/ClientContext.cpp
++++ b/subversion/bindings/javahl/native/ClientContext.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class ClientContext
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_client.h"
+ #include "private/svn_wc_private.h"
+
+diff --git a/subversion/bindings/javahl/native/CommitCallback.h b/subversion/bindings/javahl/native/CommitCallback.h
+index 0c4fe0f..631237f 100644
+--- a/subversion/bindings/javahl/native/CommitCallback.h
++++ b/subversion/bindings/javahl/native/CommitCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef COMMITCALLBACK_H
+ #define COMMITCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/CommitEditor.h b/subversion/bindings/javahl/native/CommitEditor.h
+index 4160b6c..6aeb218 100644
+--- a/subversion/bindings/javahl/native/CommitEditor.h
++++ b/subversion/bindings/javahl/native/CommitEditor.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_COMMIT_EDITOR_H
+ #define JAVAHL_COMMIT_EDITOR_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <string>
+ #include <jni.h>
+
+diff --git a/subversion/bindings/javahl/native/CommitMessage.h b/subversion/bindings/javahl/native/CommitMessage.h
+index 1ce94f8..e0f9de2 100644
+--- a/subversion/bindings/javahl/native/CommitMessage.h
++++ b/subversion/bindings/javahl/native/CommitMessage.h
+@@ -27,6 +27,10 @@
+ #ifndef COMMITMESSAGE_H
+ #define COMMITMESSAGE_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ #include "svn_client.h"
+diff --git a/subversion/bindings/javahl/native/CopySources.cpp b/subversion/bindings/javahl/native/CopySources.cpp
+index a1d93f4..0e4868d 100644
+--- a/subversion/bindings/javahl/native/CopySources.cpp
++++ b/subversion/bindings/javahl/native/CopySources.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class CopySources
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_pools.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/CreateJ.cpp b/subversion/bindings/javahl/native/CreateJ.cpp
+index c6aebd7..4d8a72b 100644
+--- a/subversion/bindings/javahl/native/CreateJ.cpp
++++ b/subversion/bindings/javahl/native/CreateJ.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class CreateJ.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_error.h"
+
+ #include "JNIUtil.h"
+diff --git a/subversion/bindings/javahl/native/Credential.hpp b/subversion/bindings/javahl/native/Credential.hpp
+index 5c0c66d..c928f57 100644
+--- a/subversion/bindings/javahl/native/Credential.hpp
++++ b/subversion/bindings/javahl/native/Credential.hpp
+@@ -24,6 +24,10 @@
+ #ifndef SVN_JAVAHL_CREDENTIAL_HPP
+ #define SVN_JAVAHL_CREDENTIAL_HPP
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "jniwrapper/jni_object.hpp"
+ #include "jniwrapper/jni_string.hpp"
+
+diff --git a/subversion/bindings/javahl/native/DiffOptions.h b/subversion/bindings/javahl/native/DiffOptions.h
+index 0dc4d9a..28a5bf7 100644
+--- a/subversion/bindings/javahl/native/DiffOptions.h
++++ b/subversion/bindings/javahl/native/DiffOptions.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_DIFF_OPTIONS_H
+ #define JAVAHL_DIFF_OPTIONS_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_tables.h>
+ #include "svn_types.h"
+ #include "svn_diff.h"
+diff --git a/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp b/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
+index 8ad3a91..d86c0e8 100644
+--- a/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
++++ b/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class DiffSummaryReceiver
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "JNIUtil.h"
+ #include "EnumMapper.h"
+ #include "DiffSummaryReceiver.h"
+diff --git a/subversion/bindings/javahl/native/EditorCallbacks.hpp b/subversion/bindings/javahl/native/EditorCallbacks.hpp
+index 8918ee3..3cb078d 100644
+--- a/subversion/bindings/javahl/native/EditorCallbacks.hpp
++++ b/subversion/bindings/javahl/native/EditorCallbacks.hpp
+@@ -24,6 +24,10 @@
+ #ifndef SVN_JAVAHL_EDITOR_CALLBACKS_HPP
+ #define SVN_JAVAHL_EDITOR_CALLBACKS_HPP
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_io.h"
+
+ #include "Pool.h"
+diff --git a/subversion/bindings/javahl/native/EditorProxy.cpp b/subversion/bindings/javahl/native/EditorProxy.cpp
+index 83792ab..30bceb3 100644
+--- a/subversion/bindings/javahl/native/EditorProxy.cpp
++++ b/subversion/bindings/javahl/native/EditorProxy.cpp
+@@ -23,6 +23,11 @@
+ * @file EditorProxy.cpp
+ * @brief Interface of all editor proxy classes
+ */
++
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_pools.h>
+
+ #include "JNIUtil.h"
+diff --git a/subversion/bindings/javahl/native/EnumMapper.cpp b/subversion/bindings/javahl/native/EnumMapper.cpp
+index 8e8ca50..16ed125 100644
+--- a/subversion/bindings/javahl/native/EnumMapper.cpp
++++ b/subversion/bindings/javahl/native/EnumMapper.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class EnumMapper
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_types.h"
+ #include "svn_wc.h"
+ #include "svn_client.h"
+diff --git a/subversion/bindings/javahl/native/File.cpp b/subversion/bindings/javahl/native/File.cpp
+index 76e92dd..5890b98 100644
+--- a/subversion/bindings/javahl/native/File.cpp
++++ b/subversion/bindings/javahl/native/File.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class File
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_path.h"
+
+ #include "File.h"
+diff --git a/subversion/bindings/javahl/native/ImportFilterCallback.h b/subversion/bindings/javahl/native/ImportFilterCallback.h
+index d202aef..d13e830 100644
+--- a/subversion/bindings/javahl/native/ImportFilterCallback.h
++++ b/subversion/bindings/javahl/native/ImportFilterCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef IMPORT_FILTER_CALLBACK_H
+ #define IMPORT_FILTER_CALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/InfoCallback.h b/subversion/bindings/javahl/native/InfoCallback.h
+index a1975d2..038fe0f 100644
+--- a/subversion/bindings/javahl/native/InfoCallback.h
++++ b/subversion/bindings/javahl/native/InfoCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef INFOCALLBACK_H
+ #define INFOCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/InputStream.h b/subversion/bindings/javahl/native/InputStream.h
+index 1787c18..36b53a6 100644
+--- a/subversion/bindings/javahl/native/InputStream.h
++++ b/subversion/bindings/javahl/native/InputStream.h
+@@ -27,6 +27,10 @@
+ #ifndef INPUT_STREAM_H
+ #define INPUT_STREAM_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_io.h"
+ #include "Pool.h"
+diff --git a/subversion/bindings/javahl/native/Iterator.h b/subversion/bindings/javahl/native/Iterator.h
+index 37dac1e..d3d3def 100644
+--- a/subversion/bindings/javahl/native/Iterator.h
++++ b/subversion/bindings/javahl/native/Iterator.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_ITERATOR_H
+ #define JAVAHL_ITERATOR_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "JNIUtil.h"
+
+ /**
+diff --git a/subversion/bindings/javahl/native/JNIByteArray.h b/subversion/bindings/javahl/native/JNIByteArray.h
+index e988bda..3d5589c 100644
+--- a/subversion/bindings/javahl/native/JNIByteArray.h
++++ b/subversion/bindings/javahl/native/JNIByteArray.h
+@@ -27,6 +27,10 @@
+ #ifndef JNIBYTEARRAY_H
+ #define JNIBYTEARRAY_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ /**
+diff --git a/subversion/bindings/javahl/native/JNICriticalSection.h b/subversion/bindings/javahl/native/JNICriticalSection.h
+index d628c7e..a373365 100644
+--- a/subversion/bindings/javahl/native/JNICriticalSection.h
++++ b/subversion/bindings/javahl/native/JNICriticalSection.h
+@@ -27,6 +27,10 @@
+ #ifndef JNICRITICALSECTION_H
+ #define JNICRITICALSECTION_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ class JNIMutex;
+
+ /**
+diff --git a/subversion/bindings/javahl/native/JNIMutex.h b/subversion/bindings/javahl/native/JNIMutex.h
+index 98c124e..36e6d2c 100644
+--- a/subversion/bindings/javahl/native/JNIMutex.h
++++ b/subversion/bindings/javahl/native/JNIMutex.h
+@@ -27,6 +27,10 @@
+ #ifndef JNIMUTEX_H
+ #define JNIMUTEX_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ class JNICriticalSection;
+ struct apr_pool_t;
+ struct apr_thread_mutex_t;
+diff --git a/subversion/bindings/javahl/native/JNIStackElement.h b/subversion/bindings/javahl/native/JNIStackElement.h
+index 61708c3..af53739 100644
+--- a/subversion/bindings/javahl/native/JNIStackElement.h
++++ b/subversion/bindings/javahl/native/JNIStackElement.h
+@@ -27,6 +27,10 @@
+ #ifndef JNISTACKELEMENT_H
+ #define JNISTACKELEMENT_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "JNIUtil.h"
+
+diff --git a/subversion/bindings/javahl/native/JNIStringHolder.cpp b/subversion/bindings/javahl/native/JNIStringHolder.cpp
+index 4ed44cf..df80fd6 100644
+--- a/subversion/bindings/javahl/native/JNIStringHolder.cpp
++++ b/subversion/bindings/javahl/native/JNIStringHolder.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class JNIStringHolder
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include <apr_pools.h>
+ #include <apr_strings.h>
+diff --git a/subversion/bindings/javahl/native/JNIUtil.cpp b/subversion/bindings/javahl/native/JNIUtil.cpp
+index f62b4f1..dd34631 100644
+--- a/subversion/bindings/javahl/native/JNIUtil.cpp
++++ b/subversion/bindings/javahl/native/JNIUtil.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class JNIUtil
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ /* Include apr.h first, or INT64_C won't be defined properly on some C99
+ compilers, when other headers include <stdint.h> before defining some
+ macros.
+diff --git a/subversion/bindings/javahl/native/JNIUtil.h b/subversion/bindings/javahl/native/JNIUtil.h
+index e05d1ef..fec37ed 100644
+--- a/subversion/bindings/javahl/native/JNIUtil.h
++++ b/subversion/bindings/javahl/native/JNIUtil.h
+@@ -27,12 +27,17 @@
+ #ifndef JNIUTIL_H
+ #define JNIUTIL_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <list>
+ #include <vector>
+ #include "Pool.h"
+ struct apr_pool_t;
+ class JNIMutex;
+ class SVNBase;
++
+ #include <jni.h>
+ #include <fstream>
+ #include <apr_time.h>
+diff --git a/subversion/bindings/javahl/native/ListCallback.h b/subversion/bindings/javahl/native/ListCallback.h
+index 95d4e3e..8375a2a 100644
+--- a/subversion/bindings/javahl/native/ListCallback.h
++++ b/subversion/bindings/javahl/native/ListCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef LISTCALLBACK_H
+ #define LISTCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/LockTokenTable.h b/subversion/bindings/javahl/native/LockTokenTable.h
+index af8b32a..de7cee3 100644
+--- a/subversion/bindings/javahl/native/LockTokenTable.h
++++ b/subversion/bindings/javahl/native/LockTokenTable.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_LOCK_TOKEN_TABLE_H
+ #define JAVAHL_LOCK_TOKEN_TABLE_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+
+diff --git a/subversion/bindings/javahl/native/LogMessageCallback.h b/subversion/bindings/javahl/native/LogMessageCallback.h
+index 3a42da2..da63c6d 100644
+--- a/subversion/bindings/javahl/native/LogMessageCallback.h
++++ b/subversion/bindings/javahl/native/LogMessageCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef LOGMESSAGECALLBACK_H
+ #define LOGMESSAGECALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/MessageReceiver.h b/subversion/bindings/javahl/native/MessageReceiver.h
+index c0fdb6c..7e6b2b9 100644
+--- a/subversion/bindings/javahl/native/MessageReceiver.h
++++ b/subversion/bindings/javahl/native/MessageReceiver.h
+@@ -27,6 +27,10 @@
+ #ifndef MESSAGERECEIVER_H
+ #define MESSAGERECEIVER_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ /**
+diff --git a/subversion/bindings/javahl/native/NativeStream.hpp b/subversion/bindings/javahl/native/NativeStream.hpp
+index 57fd137..3600006 100644
+--- a/subversion/bindings/javahl/native/NativeStream.hpp
++++ b/subversion/bindings/javahl/native/NativeStream.hpp
+@@ -24,6 +24,10 @@
+ #ifndef SVN_JAVAHL_NATIVE_STREAM_HPP
+ #define SVN_JAVAHL_NATIVE_STREAM_HPP
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+
+ #include "jniwrapper/jni_array.hpp"
+diff --git a/subversion/bindings/javahl/native/OperationContext.cpp b/subversion/bindings/javahl/native/OperationContext.cpp
+index d9c0543..31ce3b1 100644
+--- a/subversion/bindings/javahl/native/OperationContext.cpp
++++ b/subversion/bindings/javahl/native/OperationContext.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class OperationContext
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_file_io.h>
+
+ #include "GlobalConfig.h"
+diff --git a/subversion/bindings/javahl/native/OutputStream.h b/subversion/bindings/javahl/native/OutputStream.h
+index d78865a..add1971 100644
+--- a/subversion/bindings/javahl/native/OutputStream.h
++++ b/subversion/bindings/javahl/native/OutputStream.h
+@@ -27,6 +27,10 @@
+ #ifndef OUTPUT_STREAM_H
+ #define OUTPUT_STREAM_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_io.h"
+ #include "Pool.h"
+diff --git a/subversion/bindings/javahl/native/PatchCallback.h b/subversion/bindings/javahl/native/PatchCallback.h
+index 61ec883..b970ae3 100644
+--- a/subversion/bindings/javahl/native/PatchCallback.h
++++ b/subversion/bindings/javahl/native/PatchCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef PATCHCALLBACK_H
+ #define PATCHCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/Path.cpp b/subversion/bindings/javahl/native/Path.cpp
+index 625634e..d6daff8 100644
+--- a/subversion/bindings/javahl/native/Path.cpp
++++ b/subversion/bindings/javahl/native/Path.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class Path
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Path.h"
+ #include "svn_path.h"
+diff --git a/subversion/bindings/javahl/native/Pool.h b/subversion/bindings/javahl/native/Pool.h
+index a5b5f8e..a4c56f0 100644
+--- a/subversion/bindings/javahl/native/Pool.h
++++ b/subversion/bindings/javahl/native/Pool.h
+@@ -27,6 +27,10 @@
+ #ifndef POOL_H
+ #define POOL_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_pools.h"
+
+ namespace SVN {
+diff --git a/subversion/bindings/javahl/native/Prompter.h b/subversion/bindings/javahl/native/Prompter.h
+index 7782f9e..675d56f 100644
+--- a/subversion/bindings/javahl/native/Prompter.h
++++ b/subversion/bindings/javahl/native/Prompter.h
+@@ -27,6 +27,10 @@
+ #ifndef SVN_JAVAHL_PROMPTER_H
+ #define SVN_JAVAHL_PROMPTER_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <memory>
+
+ #include "svn_auth.h"
+diff --git a/subversion/bindings/javahl/native/PropertyTable.h b/subversion/bindings/javahl/native/PropertyTable.h
+index 8a9a335..4662ac4 100644
+--- a/subversion/bindings/javahl/native/PropertyTable.h
++++ b/subversion/bindings/javahl/native/PropertyTable.h
+@@ -27,6 +27,10 @@
+ #ifndef REVPROPTABLE_H
+ #define REVPROPTABLE_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+
+diff --git a/subversion/bindings/javahl/native/ProplistCallback.h b/subversion/bindings/javahl/native/ProplistCallback.h
+index 09c8126..d52c1aa 100644
+--- a/subversion/bindings/javahl/native/ProplistCallback.h
++++ b/subversion/bindings/javahl/native/ProplistCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef PROPLISTCALLBACK_H
+ #define PROPLISTCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/RemoteSession.cpp b/subversion/bindings/javahl/native/RemoteSession.cpp
+index 57e4a91..98656d8 100644
+--- a/subversion/bindings/javahl/native/RemoteSession.cpp
++++ b/subversion/bindings/javahl/native/RemoteSession.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class RemoteSession
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <cstring>
+ #include <memory>
+ #include <set>
+diff --git a/subversion/bindings/javahl/native/RemoteSession.h b/subversion/bindings/javahl/native/RemoteSession.h
+index e3117b3..9677163 100644
+--- a/subversion/bindings/javahl/native/RemoteSession.h
++++ b/subversion/bindings/javahl/native/RemoteSession.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_REMOTE_SESSION_H
+ #define JAVAHL_REMOTE_SESSION_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ #include "svn_ra.h"
+diff --git a/subversion/bindings/javahl/native/RemoteSessionContext.h b/subversion/bindings/javahl/native/RemoteSessionContext.h
+index 3b90c7e..6fa0917 100644
+--- a/subversion/bindings/javahl/native/RemoteSessionContext.h
++++ b/subversion/bindings/javahl/native/RemoteSessionContext.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_REMOTE_SESSION_CONTEXT_H
+ #define JAVAHL_REMOTE_SESSION_CONTEXT_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "svn_ra.h"
+
+ #include "OperationContext.h"
+diff --git a/subversion/bindings/javahl/native/ReposFreezeAction.h b/subversion/bindings/javahl/native/ReposFreezeAction.h
+index 59971ac..2a1f4b7 100644
+--- a/subversion/bindings/javahl/native/ReposFreezeAction.h
++++ b/subversion/bindings/javahl/native/ReposFreezeAction.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_REPOS_FREEZE_ACTION_H
+ #define JAVAHL_REPOS_FREEZE_ACTION_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_pools.h>
+ #include "svn_error.h"
+ #include "JNIUtil.h"
+diff --git a/subversion/bindings/javahl/native/ReposNotifyCallback.h b/subversion/bindings/javahl/native/ReposNotifyCallback.h
+index 2f36380..83806f1 100644
+--- a/subversion/bindings/javahl/native/ReposNotifyCallback.h
++++ b/subversion/bindings/javahl/native/ReposNotifyCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef REPOSNOTIFYCALLBACK_H
+ #define REPOSNOTIFYCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_repos.h"
+
+diff --git a/subversion/bindings/javahl/native/ReposVerifyCallback.h b/subversion/bindings/javahl/native/ReposVerifyCallback.h
+index a89d204..03e82cb 100644
+--- a/subversion/bindings/javahl/native/ReposVerifyCallback.h
++++ b/subversion/bindings/javahl/native/ReposVerifyCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef SVN_JAVAHL_REPOS_VERIFY_CALLBACK_H
+ #define SVN_JAVAHL_REPOS_VERIFY_CALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_repos.h"
+
+diff --git a/subversion/bindings/javahl/native/Revision.h b/subversion/bindings/javahl/native/Revision.h
+index d98a868..5d65798 100644
+--- a/subversion/bindings/javahl/native/Revision.h
++++ b/subversion/bindings/javahl/native/Revision.h
+@@ -27,6 +27,10 @@
+ #ifndef REVISION_H
+ #define REVISION_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_opt.h"
+
+diff --git a/subversion/bindings/javahl/native/RevisionRange.cpp b/subversion/bindings/javahl/native/RevisionRange.cpp
+index d1c8c64..8ca2ed0 100644
+--- a/subversion/bindings/javahl/native/RevisionRange.cpp
++++ b/subversion/bindings/javahl/native/RevisionRange.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class RevisionRange.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <apr_pools.h>
+ #include "svn_client.h"
+ #include "svn_types.h"
+diff --git a/subversion/bindings/javahl/native/RevisionRange.h b/subversion/bindings/javahl/native/RevisionRange.h
+index 9934894..eada623 100644
+--- a/subversion/bindings/javahl/native/RevisionRange.h
++++ b/subversion/bindings/javahl/native/RevisionRange.h
+@@ -27,6 +27,10 @@
+ #ifndef REVISION_RANGE_H
+ #define REVISION_RANGE_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_types.h"
+ #include "svn_opt.h"
+diff --git a/subversion/bindings/javahl/native/RevisionRangeList.h b/subversion/bindings/javahl/native/RevisionRangeList.h
+index 116ff0d..47864fa 100644
+--- a/subversion/bindings/javahl/native/RevisionRangeList.h
++++ b/subversion/bindings/javahl/native/RevisionRangeList.h
+@@ -27,6 +27,10 @@
+ #ifndef REVISION_RANGE_LIST_H
+ #define REVISION_RANGE_LIST_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_mergeinfo.h"
+
+diff --git a/subversion/bindings/javahl/native/SVNBase.h b/subversion/bindings/javahl/native/SVNBase.h
+index 9b3d41a..8e9a796 100644
+--- a/subversion/bindings/javahl/native/SVNBase.h
++++ b/subversion/bindings/javahl/native/SVNBase.h
+@@ -27,6 +27,10 @@
+ #ifndef SVNBASE_H
+ #define SVNBASE_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+
+diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp
+index 2c83f56..2c3ec6e 100644
+--- a/subversion/bindings/javahl/native/SVNClient.cpp
++++ b/subversion/bindings/javahl/native/SVNClient.cpp
+@@ -24,6 +24,10 @@
+ * @brief: Implementation of the SVNClient class
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <vector>
+ #include <iostream>
+ #include <sstream>
+diff --git a/subversion/bindings/javahl/native/SVNClient.h b/subversion/bindings/javahl/native/SVNClient.h
+index 24fc5b5..fd67da7 100644
+--- a/subversion/bindings/javahl/native/SVNClient.h
++++ b/subversion/bindings/javahl/native/SVNClient.h
+@@ -29,6 +29,11 @@
+
+ #include <vector>
+ #include <string>
++
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Path.h"
+ #include "ClientContext.h"
+diff --git a/subversion/bindings/javahl/native/SVNRepos.h b/subversion/bindings/javahl/native/SVNRepos.h
+index 28a236a..ea355ca 100644
+--- a/subversion/bindings/javahl/native/SVNRepos.h
++++ b/subversion/bindings/javahl/native/SVNRepos.h
+@@ -27,6 +27,10 @@
+ #ifndef SVNADMIN_H
+ #define SVNADMIN_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_repos.h"
+ #include "SVNBase.h"
+diff --git a/subversion/bindings/javahl/native/StateReporter.cpp b/subversion/bindings/javahl/native/StateReporter.cpp
+index 5ce207b..9bd52a4 100644
+--- a/subversion/bindings/javahl/native/StateReporter.cpp
++++ b/subversion/bindings/javahl/native/StateReporter.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the class StateReporter
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ #include "JNIUtil.h"
+diff --git a/subversion/bindings/javahl/native/StateReporter.h b/subversion/bindings/javahl/native/StateReporter.h
+index 9ba409f..f140d9d 100644
+--- a/subversion/bindings/javahl/native/StateReporter.h
++++ b/subversion/bindings/javahl/native/StateReporter.h
+@@ -27,6 +27,10 @@
+ #ifndef JAVAHL_UPDATE_REPORTER_H
+ #define JAVAHL_UPDATE_REPORTER_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+
+ #include "svn_ra.h"
+diff --git a/subversion/bindings/javahl/native/StatusCallback.h b/subversion/bindings/javahl/native/StatusCallback.h
+index c513ef0..4361936 100644
+--- a/subversion/bindings/javahl/native/StatusCallback.h
++++ b/subversion/bindings/javahl/native/StatusCallback.h
+@@ -27,6 +27,10 @@
+ #ifndef STATUSCALLBACK_H
+ #define STATUSCALLBACK_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "svn_client.h"
+
+diff --git a/subversion/bindings/javahl/native/StringArray.h b/subversion/bindings/javahl/native/StringArray.h
+index 912a271..d04d59c 100644
+--- a/subversion/bindings/javahl/native/StringArray.h
++++ b/subversion/bindings/javahl/native/StringArray.h
+@@ -27,6 +27,10 @@
+ #ifndef STRINGARRAY_H
+ #define STRINGARRAY_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+
+diff --git a/subversion/bindings/javahl/native/SubversionException.hpp b/subversion/bindings/javahl/native/SubversionException.hpp
+index 5c71107..be1e3a7 100644
+--- a/subversion/bindings/javahl/native/SubversionException.hpp
++++ b/subversion/bindings/javahl/native/SubversionException.hpp
+@@ -24,6 +24,10 @@
+ #ifndef SVN_JAVAHL_SUBVERSION_EXCEPTION_HPP
+ #define SVN_JAVAHL_SUBVERSION_EXCEPTION_HPP
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "jniwrapper/jni_exception.hpp"
+
+ namespace JavaHL {
+diff --git a/subversion/bindings/javahl/native/Targets.h b/subversion/bindings/javahl/native/Targets.h
+index 8d27a0d..326399c 100644
+--- a/subversion/bindings/javahl/native/Targets.h
++++ b/subversion/bindings/javahl/native/Targets.h
+@@ -27,6 +27,10 @@
+ #ifndef TARGETS_H
+ #define TARGETS_H
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <jni.h>
+ #include "Pool.h"
+ #include "StringArray.h"
+diff --git a/subversion/bindings/javahl/native/Utility.cpp b/subversion/bindings/javahl/native/Utility.cpp
+index 9e30386..77f34d3 100644
+--- a/subversion/bindings/javahl/native/Utility.cpp
++++ b/subversion/bindings/javahl/native/Utility.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <string>
+ #include <apr_strings.h>
+
+diff --git a/subversion/bindings/javahl/native/deprecated.cpp b/subversion/bindings/javahl/native/deprecated.cpp
+index 2ba5e10..2f13a68 100644
+--- a/subversion/bindings/javahl/native/deprecated.cpp
++++ b/subversion/bindings/javahl/native/deprecated.cpp
+@@ -25,6 +25,10 @@
+ * Subversion APIs.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ /* We define this here to remove any further warnings about the usage of
+ deprecated functions in this file. */
+ #define SVN_DEPRECATED
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
+index 715e756..63e9664 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <cstring>
+ #include <memory>
+ #include <apr.h>
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp
+index a3d41b2..1e90930 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+
+ #include "jni_object.hpp"
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
+index 43fd506..0418c51 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+
+ #include <apr_atomic.h>
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
+index c2f96ba..f44507f 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "jni_globalref.hpp"
+ #include "jni_io_stream.hpp"
+ #include "jni_stack.hpp"
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
+index a6e3d1c..227ef17 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+
+ #include "jni_iterator.hpp"
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
+index e7b8a41..f17f62d 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+ #include <string>
+
+diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
+index 369d956..47c262e 100644
+--- a/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
++++ b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
+@@ -21,6 +21,10 @@
+ * @endcopyright
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <stdexcept>
+
+ #include "jni_string.hpp"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
+index a6be60f..680d9a2 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
+@@ -25,6 +25,10 @@
+ * NativeResources.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_NativeResources.h"
+
+ JNIEXPORT void JNICALL
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
+index da7bb21..0130404 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class SVNClient
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_SVNClient.h"
+ #include "JNIUtil.h"
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
+index 84899fd..35fbcac 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class SVNRepos
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_SVNRepos.h"
+ #include "JNIUtil.h"
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
+index e871b0c..dddc3dd 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class CommitEditor
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_remote_CommitEditor.h"
+
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
+index 80c0c42..c863903 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class RemoteFactory
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_remote_RemoteFactory.h"
+
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
+index fcea536..9511f89 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class RemoteSession
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_remote_RemoteSession.h"
+
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
+index 5f481d8..3eeb9d8 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class StateReporter
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_remote_StateReporter.h"
+
+ #include <jni.h>
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp
+index 4c54118..e13047a 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp
+@@ -25,6 +25,9 @@
+ * RevisionRangeList.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
+
+ #include "../include/org_apache_subversion_javahl_types_RevisionRangeList.h"
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
+index ed43fb7..fb3d2ec 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class RuntimeVersion.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_types_RuntimeVersion.h"
+ #include "svn_client.h"
+ #include "svn_version.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
+index 72d52a3..b69c560 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class Version.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_types_Version.h"
+ #include "JNIStackElement.h"
+ #include "svn_version.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
+index b1ecd72..cd40a7b 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class VersionExtended.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_types_VersionExtended.h"
+ #include "../include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h"
+ #include "../include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
+index 7849eeb..93de5f0 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
+@@ -25,6 +25,10 @@
+ * util.ConfigImpl.Category.
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <string>
+ #include <vector>
+
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
+index 0630098..6d052e1 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class ConfigLib
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_util_ConfigLib.h"
+
+ #include <apr_fnmatch.h>
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
+index c6d3d6e..b8ad833 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class DiffLib
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include "../include/org_apache_subversion_javahl_util_DiffLib.h"
+
+ #include "JNIStackElement.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
+index d133f82..3a14f8b 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class PropLib
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <iostream>
+ #include <sstream>
+
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
+index e4bb8c8..a9c4530 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
+@@ -24,6 +24,10 @@
+ * @brief Implementation of the native methods in the Java class SubstLib
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <memory>
+
+ #include "../include/org_apache_subversion_javahl_util_SubstLib.h"
+diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
+index b18f3fc..1962f1f 100644
+--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
++++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
+@@ -25,6 +25,10 @@
+ * TunnelChannel, RequestChannel and ResponseChannel
+ */
+
++#include <sys/feature_tests.h>
++#undef _RESTRICT_KYWD
++#define _RESTRICT_KYWD __restrict
++
+ #include <string>
+
+ #include <apr_file_io.h>
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list