[jffi] 01/02: Merge branch 'upstream'

Tim Potter tpot-guest at moszumanska.debian.org
Wed Mar 4 10:42:24 UTC 2015


This is an automated email from the git hooks/post-receive script.

tpot-guest pushed a commit to branch master
in repository jffi.

commit 4eccf5f575bd3ddb776938150b58f4f46692554a
Merge: 2c01285 7d8b394
Author: Tim Potter <tpot at hp.com>
Date:   Wed Mar 4 12:59:54 2015 +1100

    Merge branch 'upstream'

 .gitignore                                         |    2 +
 .settings/org.eclipse.jdt.core.prefs               |    6 -
 .settings/org.maven.ide.eclipse.prefs              |    9 -
 .travis.yml                                        |    6 +
 COPYING => COPYING.GPL                             |    0
 LICENSE                                            |   19 +-
 build.xml                                          |  488 ++++-
 custom-build.xml                                   |  218 --
 jni/GNUmakefile                                    |  104 +-
 jni/jffi/Array.c                                   |  170 +-
 jni/jffi/Array.h                                   |   52 +-
 jni/jffi/CallContext.c                             |  122 +-
 jni/jffi/CallContext.h                             |   49 +
 jni/jffi/ClosureMagazine.c                         |  214 +-
 jni/jffi/Exception.c                               |   30 +-
 jni/jffi/Exception.h                               |   30 +-
 jni/jffi/FastIntInvoke.c                           |  280 +--
 jni/jffi/FastLongInvoke.c                          |  255 ++-
 jni/jffi/FastNumeric.h                             |  105 +
 jni/jffi/FastNumericInvoker.c                      |  513 ++++-
 jni/jffi/FaultProtect.c                            |  175 ++
 jni/jffi/FaultProtect.h                            |  126 ++
 jni/jffi/Foreign.c                                 |  116 +
 jni/jffi/Function.c                                |  155 --
 jni/jffi/Function.h                                |   23 -
 jni/jffi/Internals.c                               |   43 +
 jni/jffi/Invoke.c                                  |  328 ++-
 jni/jffi/LastError.c                               |   63 +
 jni/jffi/LastError.h                               |   36 +
 jni/jffi/Library.c                                 |   32 +
 jni/jffi/LongDouble.c                              |  157 ++
 jni/jffi/Memory.c                                  |   32 +
 jni/jffi/MemoryIO.c                                |  206 +-
 jni/jffi/MemoryUtil.c                              |   24 +-
 jni/jffi/MemoryUtil.h                              |   32 +
 jni/jffi/Struct.c                                  |   32 +
 jni/jffi/Type.c                                    |   32 +
 jni/jffi/Type.h                                    |   32 +
 jni/jffi/darwin-longjmp.S                          |   45 +
 jni/jffi/darwin-trampoline.S                       |   45 +
 jni/jffi/deprecated.c                              |   32 +
 jni/jffi/endian.h                                  |   32 +
 jni/jffi/jffi.h                                    |   47 +-
 jni/jffi/longjmp.c                                 |  109 +
 jni/jffi/setjmp.c                                  |   24 +
 lib/nblibraries.properties                         |   12 -
 libtest/ClosureTest.c                              |   40 +
 libtest/GNUmakefile                                |   48 +-
 libtest/NumberTest.c                               |    3 +
 libtest/PointerTest.c                              |   93 +
 nbproject/build-impl.xml                           |  830 --------
 nbproject/genfiles.properties                      |    8 -
 nbproject/project.properties                       |   69 -
 nbproject/project.xml                              |   19 -
 pom.xml                                            |  195 +-
 src/com/kenai/jffi/Aggregate.java                  |   82 -
 src/com/kenai/jffi/Array.java                      |   58 -
 src/com/kenai/jffi/CallContext.java                |  171 --
 src/com/kenai/jffi/CallInfo.java                   |   26 -
 src/com/kenai/jffi/CallingConvention.java          |   33 -
 src/com/kenai/jffi/Foreign.java                    | 1286 -----------
 src/com/kenai/jffi/Init.java                       |  194 --
 src/com/kenai/jffi/Internals.java                  |   32 -
 src/com/kenai/jffi/Invoker.java                    |  547 -----
 src/com/kenai/jffi/NativeMethod.java               |   67 -
 src/com/kenai/jffi/NativeMethods.java              |  114 -
 src/com/kenai/jffi/NativeType.java                 |   35 -
 src/com/kenai/jffi/Struct.java                     |   37 -
 src/com/kenai/jffi/Union.java                      |   37 -
 src/main/assembly/native.xml                       |   20 +
 src/main/java/com/kenai/jffi/Aggregate.java        |   70 +
 src/main/java/com/kenai/jffi/Array.java            |  104 +
 src/{ => main/java}/com/kenai/jffi/ArrayFlags.java |   26 +-
 src/main/java/com/kenai/jffi/CallContext.java      |  239 +++
 .../java}/com/kenai/jffi/CallContextCache.java     |   51 +-
 .../java/com/kenai/jffi/CallingConvention.java     |   47 +
 src/{ => main/java}/com/kenai/jffi/Closure.java    |   24 +-
 src/main/java/com/kenai/jffi/ClosureMagazine.java  |   74 +
 .../java}/com/kenai/jffi/ClosureManager.java       |   48 +-
 .../java}/com/kenai/jffi/ClosurePool.java          |  227 +-
 .../java}/com/kenai/jffi/DirectClosureBuffer.java  |   24 +-
 .../kenai/jffi/DirectObjectParameterStrategy.java  |   56 +
 src/main/java/com/kenai/jffi/FaultException.java   |   29 +
 src/main/java/com/kenai/jffi/Foreign.java          | 1775 ++++++++++++++++
 src/{ => main/java}/com/kenai/jffi/Function.java   |  114 +-
 .../java}/com/kenai/jffi/HeapInvocationBuffer.java |  342 +--
 .../com/kenai/jffi/HeapObjectParameterInvoker.java |  267 +++
 src/main/java/com/kenai/jffi/Init.java             |  137 ++
 src/main/java/com/kenai/jffi/Internals.java        |   46 +
 .../java}/com/kenai/jffi/InvocationBuffer.java     |   30 +-
 .../java/com/kenai/jffi/InvokeDynamicSupport.java  |  182 ++
 src/main/java/com/kenai/jffi/Invoker.java          | 2226 ++++++++++++++++++++
 src/{ => main/java}/com/kenai/jffi/LastError.java  |   32 +-
 src/{ => main/java}/com/kenai/jffi/Library.java    |   45 +-
 src/{ => main/java}/com/kenai/jffi/MemoryIO.java   |  465 +++-
 src/main/java/com/kenai/jffi/NativeMethod.java     |   55 +
 src/main/java/com/kenai/jffi/NativeMethods.java    |  161 ++
 .../kenai/jffi/NativeObjectParameterInvoker.java   |  266 +++
 src/main/java/com/kenai/jffi/NativeType.java       |   68 +
 .../java}/com/kenai/jffi/ObjectBuffer.java         |   92 +-
 .../java/com/kenai/jffi/ObjectParameterInfo.java   |  121 ++
 .../com/kenai/jffi/ObjectParameterInvoker.java     |  144 ++
 .../com/kenai/jffi/ObjectParameterStrategy.java    |   81 +
 .../java/com/kenai/jffi/ObjectParameterType.java   |   98 +
 .../java}/com/kenai/jffi/PageManager.java          |   75 +-
 src/{ => main/java}/com/kenai/jffi/Platform.java   |  244 ++-
 src/main/java/com/kenai/jffi/Struct.java           |  116 +
 src/{ => main/java}/com/kenai/jffi/Type.java       |  154 +-
 src/main/java/com/kenai/jffi/Union.java            |   77 +
 src/main/java/com/kenai/jffi/Util.java             |   16 +
 .../java/com/kenai/jffi/internal/StubLoader.java   |  409 ++++
 .../test/java}/com/kenai/jffi/ClosureTest.java     |   42 +-
 .../test/java}/com/kenai/jffi/ForeignTest.java     |    0
 src/test/java/com/kenai/jffi/InvokerTest.java      |  336 +++
 src/test/java/com/kenai/jffi/JSR292Test.java       |   49 +
 .../test/java}/com/kenai/jffi/LibraryTest.java     |    0
 .../test/java}/com/kenai/jffi/MemoryTest.java      |    0
 .../test/java}/com/kenai/jffi/NumberTest.java      |   47 +-
 .../com/kenai/jffi/ObjectParameterInfoTest.java    |   43 +
 .../test/java}/com/kenai/jffi/PlatformTest.java    |    0
 .../test/java}/com/kenai/jffi/StructTest.java      |    0
 .../test/java}/com/kenai/jffi/TypeTest.java        |    0
 .../test/java}/com/kenai/jffi/UnitHelper.java      |   48 +-
 version.xml                                        |    2 +-
 124 files changed, 12512 insertions(+), 5618 deletions(-)

diff --cc jni/jffi/jffi.h
index d9004c9,d1f5274..d1f5274
mode 100755,100644..100755
--- a/jni/jffi/jffi.h
+++ b/jni/jffi/jffi.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi.git



More information about the pkg-java-commits mailing list