You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2008/11/06 11:35:12 UTC
svn commit: r711836 - in /tomcat/connectors/trunk/jni/native:
include/tcn_version.h src/jnilib.c
Author: mturk
Date: Thu Nov 6 02:35:07 2008
New Revision: 711836
URL: http://svn.apache.org/viewvc?rev=711836&view=rev
Log:
Bump trunk version to 1.2.0 and make APR 1.3.3+ dependent
Modified:
tomcat/connectors/trunk/jni/native/include/tcn_version.h
tomcat/connectors/trunk/jni/native/src/jnilib.c
Modified: tomcat/connectors/trunk/jni/native/include/tcn_version.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/include/tcn_version.h?rev=711836&r1=711835&r2=711836&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/include/tcn_version.h (original)
+++ tomcat/connectors/trunk/jni/native/include/tcn_version.h Thu Nov 6 02:35:07 2008
@@ -66,16 +66,16 @@
* Minor API changes that do not cause binary compatibility problems.
* Should be reset to 0 when upgrading TCN_MAJOR_VERSION
*/
-#define TCN_MINOR_VERSION 1
+#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 16
+#define TCN_PATCH_VERSION 0
/**
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#undef TCN_IS_DEV_VERSION
+#define TCN_IS_DEV_VERSION 1
/** The formatted string of APU's version */
@@ -86,7 +86,7 @@
TCN_IS_DEV_STRING
/** Internal: string form of the "is dev" flag */
-#ifdef TCN_IS_DEV_VERSION
+#if TCN_IS_DEV_VERSION
#define TCN_IS_DEV_STRING "-dev"
#else
#define TCN_IS_DEV_STRING ""
Modified: tomcat/connectors/trunk/jni/native/src/jnilib.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/jnilib.c?rev=711836&r1=711835&r2=711836&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/jnilib.c (original)
+++ tomcat/connectors/trunk/jni/native/src/jnilib.c Thu Nov 6 02:35:07 2008
@@ -59,11 +59,11 @@
tcn_global_vm = vm;
/* Before doing anything else check if we have a valid
- * APR version. We need version 1.2.1 as minimum.
+ * APR version. We need version 1.3.3 as minimum.
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
- if (apvn < 1201) {
+ if (apvn < 1303) {
tcn_Throw(env, "Unupported APR version (%s)",
apr_version_string());
return JNI_ERR;
@@ -276,11 +276,7 @@
return TCN_PATCH_VERSION;
break;
case 0x04:
-#ifdef TCN_IS_DEV_VERSION
- return 1;
-#else
- return 0;
-#endif
+ return TCN_IS_DEV_VERSION;
break;
case 0x11:
return apv.major;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org