You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/10/09 12:41:25 UTC
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in pr_warp.c
jfclere 01/10/09 03:41:25
Modified: webapp Makefile.in configure.in
webapp/apache-1.3 mod_webapp.c
webapp/lib Makefile.in pr_warp.c
Log:
Arrange it so that is compile on ReliantUnix.
Revision Changes Path
1.22 +3 -3 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 2001/10/03 12:35:14 1.21
+++ Makefile.in 2001/10/09 10:41:25 1.22
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.21 2001/10/03 12:35:14 jfclere Exp $
+# @version $Id: Makefile.in,v 1.22 2001/10/09 10:41:25 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -108,10 +108,10 @@
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="clean"
apache-2.0-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="build"
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="build"
apache-2.0-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="clean"
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="clean"
template:
@ { \
1.41 +2 -2 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure.in 2001/10/03 12:35:14 1.40
+++ configure.in 2001/10/09 10:41:25 1.41
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.40 2001/10/03 12:35:14 jfclere Exp $
+dnl Version $Id: configure.in,v 1.41 2001/10/09 10:41:25 jfclere Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -122,7 +122,7 @@
dnl -------------------------------------------------------------------------
LOCAL_HEADER([C-Language compilation tools])
LOCAL_CHECK_PROG(AR,ar)
-LOCAL_CHECK_PROG(RANLIB,ranlib)
+AC_CHECK_TOOL(RANLIB, ranlib, true)
AC_SUBST(AR)
AC_SUBST(RANLIB)
AC_PROG_CC()
1.24 +2 -2 jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
Index: mod_webapp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_webapp.c 2001/08/09 20:05:36 1.23
+++ mod_webapp.c 2001/10/09 10:41:25 1.24
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli <ma...@eng.sun.com>
- * @version $Id: mod_webapp.c,v 1.23 2001/08/09 20:05:36 pier Exp $
+ * @version $Id: mod_webapp.c,v 1.24 2001/10/09 10:41:25 jfclere Exp $
*/
#include <httpd.h>
@@ -87,7 +87,7 @@
/* ************************************************************************* */
/* Destroy the module and the WebApp Library */
-static void wam_shutdown(server_rec *s, pool *p) {//void *nil) {
+static void wam_shutdown(server_rec *s, pool *p) {/*void *nil) { */
if (!wam_initialized) return;
wa_shutdown();
wam_initialized=wa_false;
1.17 +4 -4 jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 2001/09/17 00:42:59 1.16
+++ Makefile.in 2001/10/09 10:41:25 1.17
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.16 2001/09/17 00:42:59 pier Exp $
+# @version $Id: Makefile.in,v 1.17 2001/10/09 10:41:25 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -68,7 +68,7 @@
pr_warp_packet.c \
wa_config.c \
wa_main.c \
- wa_request.c \
+ wa_request.c
OBJS = wa_main.o \
wa_config.o \
@@ -95,8 +95,8 @@
$(RANLIB) $@
pr_warp_defs.h: $(TGTDIR)/java/Constants.java
- @$(MECHO) "Generating \"$@\""
- @$(CAT) "$<" | \
+ @$(MECHO) "Generating \"$@\" from \"$?\""
+ @$(CAT) "$?" | \
$(GREP) "TYPE_" | \
$(SED) "s/public static final int/#define/g" | \
$(SED) "y/=;/ /" > $@
1.16 +5 -5 jakarta-tomcat-connectors/webapp/lib/pr_warp.c
Index: pr_warp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pr_warp.c 2001/09/17 05:05:30 1.15
+++ pr_warp.c 2001/10/09 10:41:25 1.16
@@ -54,7 +54,7 @@
* *
* ========================================================================= */
-/* @version $Id: pr_warp.c,v 1.15 2001/09/17 05:05:30 pier Exp $ */
+/* @version $Id: pr_warp.c,v 1.16 2001/10/09 10:41:25 jfclere Exp $ */
#include "pr_warp.h"
/* Initialize this provider. */
@@ -214,15 +214,15 @@
warp_packet *pack=p_create(r->pool);
int status=0;
- // Check packet
+ /* Check packet */
if (pack==NULL)
return(wa_rerror(WA_MARK,r,500,"Cannot create WARP packet"));
- // Check application
+ /* Check application */
if (((int)(appl->conf))==-1)
return(wa_rerror(WA_MARK,r,404,"Application not deployed"));
- // Attempt to reconnect if disconnected
+ /* Attempt to reconnect if disconnected */
if (conf->sock==NULL) {
if (n_connect(conn)==wa_true) {
wa_debug(WA_MARK,"Connection \"%s\" opened",conn->name);
@@ -241,7 +241,7 @@
}
}
- // Let's do it
+ /* Let's do it */
pack->type=TYPE_REQ_INIT;
p_write_int(pack,(int)(appl->conf));
p_write_string(pack,r->meth);