Changeset 26662
- Timestamp:
- 2013-01-10T15:56:18+13:00 (11 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers/mg/jni
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/mg/jni/MGPassesWrapperImpl.c
r16583 r26662 20 20 21 21 #include <jni.h> 22 23 #ifdef __MINGW32__ 24 25 /* Cross compiling for Windows 26 Want the type definitions in *win32* version of jni_md.h but 27 this then leads to C-mangled style functions which we *don't* 28 want. The following achieves this */ 29 30 #undef JNIEXPORT 31 #undef JNIIMPORT 32 #undef JNICALL 33 34 #define JNIEXPORT 35 #define JNIIMPORT 36 #define JNICALL 37 #endif 38 39 22 40 #include <assert.h> 23 41 #include "sysfuncs.h" -
main/trunk/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c
r25244 r26662 19 19 20 20 21 #include <jni.h> 22 #ifdef __MINGW32__ 23 24 /* Cross compiling for Windows 25 Want the type definitions in *win32* version of jni_md.h but 26 this then leads to C-mangled style functions which we *don't* 27 want. The following achieves this */ 28 29 #undef JNIEXPORT 30 #undef JNIIMPORT 31 #undef JNICALL 32 33 #define JNIEXPORT 34 #define JNIIMPORT 35 #define JNICALL 36 #endif 37 21 38 #include "MGWrapperImpl.h" 22 #include <jni.h> 39 23 40 #include "org_greenstone_mg_MGRetrieveWrapper.h" 24 41 … … 213 230 jstring j_index) 214 231 { 215 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);232 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 216 233 217 234 /* Get the index name as a C string */ … … 243 260 jlong j_docnum) 244 261 { 245 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);262 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 246 263 247 264 char* index_path; -
main/trunk/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c
r25244 r26662 19 19 20 20 21 #include <jni.h> 22 23 #ifdef __MINGW32__ 24 25 /* Cross compiling for Windows 26 Want the type definitions in *win32* version of jni_md.h but 27 this then leads to C-mangled style functions which we *don't* 28 want. The following achieves this */ 29 30 #undef JNIEXPORT 31 #undef JNIIMPORT 32 #undef JNICALL 33 34 #define JNIEXPORT 35 #define JNIIMPORT 36 #define JNICALL 37 #endif 38 21 39 #include "MGWrapperImpl.h" 22 #include <jni.h>23 40 #include "org_greenstone_mg_MGSearchWrapper.h" 24 41 … … 252 269 jstring j_query) 253 270 { 254 MGWrapperData* data = (MGWrapperData*) ( *j_env)->GetLongField(j_env, j_obj, FID_mg_data);271 MGWrapperData* data = (MGWrapperData*) (intptr_t)(*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 255 272 256 273 char* index_path; … … 517 534 jboolean j_on) 518 535 { 519 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);536 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 520 537 521 538 if (j_on) { … … 532 549 jboolean j_on) 533 550 { 534 MGWrapperData* data = (MGWrapperData*) ( *j_env)->GetLongField(j_env, j_obj, FID_mg_data);551 MGWrapperData* data = (MGWrapperData*) (intptr_t)(*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 535 552 536 553 if (j_on) { … … 547 564 jint j_max) 548 565 { 549 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);566 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 550 567 data->queryInfo->maxDocs = j_max; 551 568 } … … 570 587 jboolean j_on) 571 588 { 572 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);589 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 573 590 data->queryInfo->needTermFreqs = j_on; 574 591 } … … 580 597 jstring j_index) 581 598 { 582 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);599 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 583 600 584 601 /* Get the index name as a C string */ … … 606 623 jint j_mode) 607 624 { 608 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);625 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 609 626 data->defaultBoolCombine = j_mode; 610 627 } … … 615 632 Java_org_greenstone_mg_MGSearchWrapper_getQueryParams(JNIEnv *j_env, jobject j_obj) 616 633 { 617 MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);634 MGWrapperData* data = (MGWrapperData*)(intptr_t) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data); 618 635 char result[512]; /* Assume this is big enough */ 619 636 -
main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c
r25244 r26662 18 18 */ 19 19 20 #include <jni.h> 21 22 #ifdef __MINGW32__ 23 24 // Cross compiling for Windows 25 // Want the type definitions in *win32* version of jni_md.h but 26 // this then leads to C-mangled style functions which we *don't* 27 // want. The following achieves this 28 29 #undef JNIEXPORT 30 #undef JNIIMPORT 31 #undef JNICALL 32 33 #define JNIEXPORT 34 #define JNIIMPORT 35 #define JNICALL 36 #endif 20 37 21 38 #include "MGWrapperImpl.h" 22 #include <jni.h>23 39 #include "org_greenstone_mg_MGWrapper.h" 40 24 41 25 42 #include "backend.h"
Note:
See TracChangeset
for help on using the changeset viewer.