Permalink
Browse files

Fixed various unresolved symbol errors (LNK2019). JyNI.dll builds now…

… successfully (tested via wine, see makefile.wine).
  • Loading branch information...
Stewori committed Aug 5, 2017
1 parent 62dc32c commit bf3036dcb4a2ba898f0af8ba5dfea1b31f2119a1
View
@@ -818,8 +818,8 @@ jobject JyNI_PyNumber_Coerce(jlong o1, jobject o2, jlong tstate);
jobject JyNI_PyNumber_Int(jlong o1, jlong tstate);
jobject JyNI_PyNumber_Long(jlong o1, jlong tstate);
jobject JyNI_PyNumber_Float(jlong o1, jlong tstate);
jobject JyNI_PyNumber_Oct(jlong o1, jlong tstate);
jobject JyNI_PyNumber_Hex(jlong o1, jlong tstate);
//jobject JyNI_PyNumber_Oct(jlong o1, jlong tstate);
//jobject JyNI_PyNumber_Hex(jlong o1, jlong tstate);
jobject JyNI_PyNumber_InPlaceAdd(jlong o1, jobject o2, jlong tstate);
jobject JyNI_PyNumber_InPlaceSubtract(jlong o1, jobject o2, jlong tstate);
jobject JyNI_PyNumber_InPlaceMultiply(jlong o1, jobject o2, jlong tstate);
View
@@ -232,23 +232,23 @@ jobject JyNI_PyNumber_Coerce(jlong o1, jobject o2, jlong tstate)
PyNumberMethod1(Int)
PyNumberMethod1(Long)
PyNumberMethod1(Float)
PyNumberMethod1(Oct)
PyNumberMethod1(Hex)
PyNumberMethod2(InplaceAdd)
PyNumberMethod2(InplaceSubtract)
PyNumberMethod2(InplaceMultiply)
PyNumberMethod2(InplaceDivide)
PyNumberMethod2(InplaceRemainder)
PyNumberMethod3(InplacePower)
PyNumberMethod2(InplaceLshift)
PyNumberMethod2(InplaceRshift)
PyNumberMethod2(InplaceAnd)
PyNumberMethod2(InplaceXor)
PyNumberMethod2(InplaceOr)
//PyNumberMethod1(Oct)
//PyNumberMethod1(Hex)
PyNumberMethod2(InPlaceAdd)
PyNumberMethod2(InPlaceSubtract)
PyNumberMethod2(InPlaceMultiply)
PyNumberMethod2(InPlaceDivide)
PyNumberMethod2(InPlaceRemainder)
PyNumberMethod3(InPlacePower)
PyNumberMethod2(InPlaceLshift)
PyNumberMethod2(InPlaceRshift)
PyNumberMethod2(InPlaceAnd)
PyNumberMethod2(InPlaceXor)
PyNumberMethod2(InPlaceOr)
PyNumberMethod2(FloorDivide)
PyNumberMethod2(TrueDivide)
PyNumberMethod2(InplaceFloorDivide)
PyNumberMethod2(InplaceTrueDivide)
PyNumberMethod2(InPlaceFloorDivide)
PyNumberMethod2(InPlaceTrueDivide)
PyNumberMethod1(Index)
@@ -310,8 +310,8 @@ jint JyNI_PySequence_Contains(jlong o1, jobject o2, jlong tstate)
return res;
}
PyMethod2(PySequence, InplaceConcat)
PySequenceSizeArgFunc(InplaceRepeat)
PyMethod2(PySequence, InPlaceConcat)
PySequenceSizeArgFunc(InPlaceRepeat)
// PyMapping-methods:
View
@@ -2534,7 +2534,9 @@ inline void putsPy(PyObject* o)
void jPrintCStackTrace()
{
#ifdef MS_WINDOWS
jputs("jPrintCStackTrace is not yet supported on Windows.");
#else
void* buf[300];
int size;
char** funcs = backtrace_symbols(buf, size);
@@ -2546,6 +2548,7 @@ void jPrintCStackTrace()
for (i = 0; i < size; ++i)
jputs(funcs[i]);
free(funcs);
#endif
}
/*
Oops, something went wrong.

0 comments on commit bf3036d

Please sign in to comment.