diff -r 50505dc3f8a6 -r f5102a892ed4 src/server/public/nsapi.h
--- a/src/server/public/nsapi.h	Sun May 26 22:05:41 2013 +0200
+++ b/src/server/public/nsapi.h	Mon May 27 12:28:56 2013 +0200
@@ -1109,20 +1109,28 @@
  * In Sun ONE Web Server 6.1 and higher, http_parse_request("", NULL, NULL)
  * returns the NSAPI version.  In previous releases, it returns -1.
  */
-#define __NSAPI_RUNTIME_VERSION \
-        ((*__nsapi30_table->f_http_parse_request)("", NULL, NULL))
+//define __NSAPI_RUNTIME_VERSION \
+//        ((*__nsapi30_table->f_http_parse_request)("", NULL, NULL))
+
+// new:
+#define __NSAPI_RUNTIME_VERSION nsapi_runtime_version()
 
 /*
  * NSAPI_RUNTIME_VERSION returns the NSAPI version the server implements.  The
  * returned NSAPI version number is reliable only in iPlanet Web Server 6.0,
  * Netscape Enterprise Server 6.0, and Sun ONE Web Server 6.0 and higher.
  */
-#define NSAPI_RUNTIME_VERSION \
-        (__NSAPI_RUNTIME_VERSION > 0 ? __NSAPI_RUNTIME_VERSION : 301)
+//define NSAPI_RUNTIME_VERSION \
+//        (__NSAPI_RUNTIME_VERSION > 0 ? __NSAPI_RUNTIME_VERSION : 301)
+
+// new:
+#define NSAPI_RUNTIME_VERSION nsapi_runtime_version()
 
 #endif /* NSAPI_VERSION >= 301 */
 
-#define system_version (*__nsapi30_table->f_system_version)
+//define system_version (*__nsapi30_table->f_system_version)
+// new:
+NSAPI_PUBLIC char* system_version();
 
 /*
  * Depending on the system, memory allocated via these macros may come from