cvs: php4 /sapi/nsapi/ nsapi.c

antw		Wed May 31 07:20:57 2000 EDT

  Modified files:
    /php4/sapi/nsapi	nsapi.c 
  Log:
  Added changes suggested by Stanislav Borutsky with respect to NSAPI_PUBLIC.
  
  
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.4 php4/sapi/nsapi/nsapi.c:1.5
--- php4/sapi/nsapi/nsapi.c:1.4	Tue May 30 06:20:18 2000
+++ php4/sapi/nsapi/nsapi.c	Wed May 31 07:20:57 2000
@@ -20,7 +20,6 @@
  * PHP includes
  */
 #define NSAPI 1
-#define XP_UNIX
 
 #include "php.h"
 #include "php_variables.h"
@@ -56,11 +55,6 @@
 #include "base/util.h"       /* is_mozilla, getline */
 #include "frame/log.h"       /* log_error */
 
-/* for unix */
-#ifndef WINAPI
-	#define WINAPI
-#endif
-
 /*
  * Timeout for net_read(). This should probably go into php.ini
  */
@@ -496,7 +490,7 @@
 	return SUCCESS;
 }
 
-void WINAPI 
+void NSAPI_PUBLIC 
 php4_close(void *vparam)
 {
 	if (sapi_module.shutdown) {
@@ -505,7 +499,7 @@
 	tsrm_shutdown();
 }
 
-int WINAPI
+int NSAPI_PUBLIC
 php4_init(pblock *pb, Session *sn, Request *rq)
 {
 	php_core_globals *core_globals;
@@ -520,7 +514,7 @@
 	return REQ_PROCEED;
 }
 
-int WINAPI
+int NSAPI_PUBLIC
 php4_execute(pblock *pb, Session *sn, Request *rq)
 {
 	int retval;
@@ -559,7 +553,7 @@
 /		<Object ppath="path/to/be/authenticated/by/php/*">
 /		AuthTrans fn="php4_auth_trans"
 /*********************************************************/
-int WINAPI 
+int NSAPI_PUBLIC 
 php4_auth_trans(pblock * pb, Session * sn, Request * rq)
 {
 	/*This is a DO NOTHING function that allows authentication information