From 8b04d0db6c55e36935690d37defb6f9b68945796 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:40:36 +0000 Subject: SPDocument->Document (bzr r8404) --- src/bind/javabind.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index f7022584f..aedd72e13 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -44,9 +44,9 @@ #include #endif -#if HAVE_SYS_STAT_H +//--tullarisc #if HAVE_SYS_STAT_H #include -#endif +//#endif #include "javabind.h" #include "javabind-private.h" -- cgit v1.2.3 From a6fa3b454bdcef9b23e0a3107b6de6b4c6a477a0 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:56:35 +0000 Subject: SPDocument->Document (bzr r8405) --- src/bind/javabind.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index aedd72e13..026486948 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -742,7 +742,7 @@ jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, js /* JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr; String s = getString(env, jstr); - SPDocument *doc = sp_document_new_from_mem(s.c_str(), s.size(), true); + Document *doc = sp_document_new_from_mem(s.c_str(), s.size(), true); */ return JNI_TRUE; } -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/bind/javabind.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bind') diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index 026486948..f7022584f 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -44,9 +44,9 @@ #include #endif -//--tullarisc #if HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H #include -//#endif +#endif #include "javabind.h" #include "javabind-private.h" @@ -742,7 +742,7 @@ jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, js /* JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr; String s = getString(env, jstr); - Document *doc = sp_document_new_from_mem(s.c_str(), s.size(), true); + SPDocument *doc = sp_document_new_from_mem(s.c_str(), s.size(), true); */ return JNI_TRUE; } -- cgit v1.2.3 From 52d2a4f66aff977d17092bb105d327d978f51470 Mon Sep 17 00:00:00 2001 From: theAdib Date: Sat, 8 Aug 2009 22:28:01 +0000 Subject: add additional files for win32 distribution (bzr r8447) --- src/bind/Makefile_insert | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/Makefile_insert b/src/bind/Makefile_insert index e91ff47f5..b640957d3 100644 --- a/src/bind/Makefile_insert +++ b/src/bind/Makefile_insert @@ -6,4 +6,6 @@ ink_common_sources += \ bind/javabind.cpp \ bind/dobinding.cpp \ bind/javainc/jni.h \ - bind/javainc/linux/jni_md.h + bind/javainc/linux/jni_md.h \ + bind/javainc/solaris/jni_md.h \ + bind/javainc/win32/jni_md.h -- cgit v1.2.3