--- ./gexamples/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./gexamples/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -22,7 +22,7 @@ PVMDIR	=	../..
 PVMIDIR	=	$(PVMDIR)/include
 PVMLDIR	=	$(PVMDIR)/lib/$(PVM_ARCH)
 PVMLIB	=	$(LOPT) -L$(PVMLDIR) -lgpvm3 -lpvm3 $(ARCHLIB)
-CFLOPTS	=	-g 
+CFLOPTS	=	-g -DUSESTRERROR
 CFLAGS	=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS)
 SDIR	=	$(PVMDIR)/gexamples
 BDIR	=	$(PVMDIR)/bin
--- ./examples/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./examples/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -24,7 +24,7 @@ SDIR		=	$(PVMDIR)/examples
 BDIR		=	$(PVMDIR)/bin
 XDIR		=	$(BDIR)/$(PVM_ARCH)
 
-CFLOPTS		=	-g 
+CFLOPTS		=	-g -DUSESTRERROR
 CFLAGS		=	$(CFLOPTS) -I$(PVMDIR)/include $(ARCHCFLAGS)
 
 ##### Need to select some architecture-specific libraries to link tasks
--- ./tasker/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./tasker/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -18,7 +18,7 @@ SDIR		=	$(PVMDIR)/tasker
 BDIR		=	$(PVMDIR)/bin
 XDIR		=	$(BDIR)/$(PVM_ARCH)
 
-CFLOPTS		=	-g 
+CFLOPTS		=	-g -DUSESTRERROR
 CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 				-DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
 LIBS		=	-L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
--- ./src/hoster.c.dist	2007-07-06 11:03:03.000000000 -0700
+++ ./src/hoster.c	2007-07-06 13:20:05.000000000 -0700
@@ -230,6 +230,7 @@ static char rcsid[] =
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <unistd.h>
 #endif
 
 #ifdef NEEDSSELECTH
--- ./src/global.h.dist	2001-02-07 15:14:03.000000000 -0800
+++ ./src/global.h	2007-07-06 10:58:56.000000000 -0700
@@ -317,6 +317,7 @@ extern	struct pvmmclass *pvmmboxclasses;
 
 
 /* General Trace Globals Declarations */
+#include "pvmtev.h"
 
 extern	struct Pvmtevdid pvmtevdidlist[];
 
--- ./src/lpvmgen.c.dist	2007-07-06 13:09:46.000000000 -0700
+++ ./src/lpvmgen.c	2007-07-06 13:10:36.000000000 -0700
@@ -671,7 +671,7 @@ struct dhandler {
  ***************/
 
 char *getenv();
-
+char *pvmnametag(int tag, int *found);
 struct pmsg *midtobuf();
 
 
--- ./src/pvmd.c.dist	2007-07-06 13:01:59.000000000 -0700
+++ ./src/pvmd.c	2007-07-06 13:04:56.000000000 -0700
@@ -1711,6 +1711,7 @@ work()
 
 	gettimeofday(&tnow, (struct timezone*)0);
 	if (pvmdebmask || myhostpart) {
+		char *ctm;
 		PVM_TIMET time_temp;
 		pvmlogprintf("%s (%s) %s %s\n",
 				hosts->ht_hosts[hosts->ht_local]->hd_name,
@@ -1719,7 +1720,8 @@ work()
 				PVM_VER);
 		pvmlogprintf("ready ");
 		time_temp = (PVM_TIMET) tnow.tv_sec;
-		pvmlogprintf(ctime(&time_temp));
+		ctm = ctime(&time_temp);
+		if( ctm != NULL )pvmlogprintf("%s\n", ctm);
 	}
 
 	/*
--- ./src/pvmlog.c.dist	2007-07-06 11:34:01.000000000 -0700
+++ ./src/pvmlog.c	2007-07-06 11:35:23.000000000 -0700
@@ -488,7 +488,7 @@ pvmlogperror(s)
 	pvmlogprintf("em=0x%lx\n", (long) em);
 
 	for (i=0; i < 10 ; i++ )
-		pvmlogprintf("[%x/%c]", em[i]);
+		pvmlogprintf("[%x/%c]", em[i], em[i]);
 	pvmlogprintf("\n");
 
 	pvmlogprintf("%s: %s\n", s, em);
--- ./src/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./src/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -61,8 +61,8 @@ SHELL		=	/bin/sh
 PVMDIR		=	../..
 SDIR		=	$(PVMDIR)/src
 LIBDIR		=	$(PVMDIR)/lib/$(PVM_ARCH)
-CFLOPTS		=	-O 
-#CFLOPTS	=	-g 
+CFLOPTS		=	-O -DUSESTRERROR
+#CFLOPTS	=	-g -DUSESTRERROR
 #OPTIONS	=	-DCLUMP_ALLOC
 #OPTIONS	=	-DSTATISTICS
 #OPTIONS	=	-p
--- ./src/lpvm.c.dist	2007-07-06 11:06:29.000000000 -0700
+++ ./src/lpvm.c	2007-07-06 13:21:01.000000000 -0700
@@ -592,6 +592,7 @@ static char rcsid[] =
 
 #ifndef WIN32
 #include <sys/socket.h>
+#include <unistd.h>
 #endif
 
 #ifndef NOUNIXDOM
--- ./hoster/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./hoster/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -20,7 +20,7 @@ SDIR		=	$(PVMDIR)/hoster
 BDIR		=	$(PVMDIR)/bin
 XDIR		=	$(BDIR)/$(PVM_ARCH)
 
-CFLOPTS		=	-O 
+CFLOPTS		=	-O -DUSESTRERROR
 CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
 				$(ARCHCFLAGS)
 LIBS		=	-L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
--- ./libfpvm/pvmfstartpvmd.m4.dist	2007-07-06 11:19:00.000000000 -0700
+++ ./libfpvm/pvmfstartpvmd.m4	2007-07-06 11:24:17.000000000 -0700
@@ -15,6 +15,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "pvm3.h"
 #include "pvm_consts.h"
 #include "pvmalloc.h"
--- ./libfpvm/pvmfperror.m4.dist	2007-07-06 11:16:43.000000000 -0700
+++ ./libfpvm/pvmfperror.m4	2007-07-06 11:28:32.000000000 -0700
@@ -2,6 +2,8 @@
 /* $Id: pvmfperror.m4,v 1.2 1996/10/04 15:27:26 pvmsrc Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "pvm3.h"
 #include "pvm_consts.h"
 
@@ -14,7 +16,7 @@ STRING_ARG_DECL(p);
 {
 	static char *buf = 0;
 	static int buflen = 0;
-	char *malloc();
+/*	char *malloc();  */
 
 	/*
 	 * Have to have a NUL at the end of the string, and
@@ -22,8 +24,10 @@ STRING_ARG_DECL(p);
 	 * into a malloc'ed buffer.  We keep the buffer around for
 	 * future use rather than free'ing it each time we're done.
 	 */
-	if (!buf)
-		buf = malloc(buflen = STRING_LEN(p) + 1);
+	if (!buf){
+		buflen = STRING_LEN(p) + 1;
+		buf = malloc(buflen);
+	}
 	else
 		if (STRING_LEN(p) + 1 > buflen) {
 			buflen = MAX(STRING_LEN(p) + 1, buflen * 2);
--- ./conf/LINUX.def.dist	2007-07-06 10:55:25.000000000 -0700
+++ ./conf/LINUX.def	2007-07-06 11:11:32.000000000 -0700
@@ -12,9 +12,10 @@
 #	On some Linux systems, readline requires ncurses, so you
 #	must also add "-lncurses" to the ARCHLIB define.
 #
-ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DRSHCOMMAND=\"/usr/bin/rsh\" \
+ARCHCFLAGS	=	-DSYSVSIGNAL -DRSHCOMMAND=\"/usr/bin/rsh\" \
 				-DNEEDENDIAN -DFDSETNOTSTRUCT -DHASERRORVARS \
-				-DCTIMEISTIMET -DSYSERRISCONST -DNOTMPNAM -DUSESTRERROR
+				-DCTIMEISTIMET -DSYSERRISCONST -DNOTMPNAM -DUSESTRERROR \
+				-DHASSTDLIB -DSYSVSTR -DSYSVBFUNC
 #
 # For Absoft Fortran 95 Compiler:
 # ARCHFFLAGS	=	-B108 -YEXT_NAMES="LCS"
--- ./tracer/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./tracer/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -16,8 +16,8 @@ SHELL		=	/bin/sh
 PVMVERSION	=
 #PVMVERSION	=	-DUSE_PVM_33
 
-CFLOPTS		=	-O 
-#CFLOPTS	=	-g 
+CFLOPTS		=	-O -DUSESTRERROR
+#CFLOPTS	=	-g -DUSESTRERROR
 
 #CC			=	cc
 #CC			=	gcc
--- ./xep/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./xep/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -19,8 +19,8 @@ SDIR		=	$(PVMDIR)/xep
 BDIR		=	$(PVMDIR)/bin
 XDIR		=	$(BDIR)/$(PVM_ARCH)
 
-#CFLOPTS	=	-O 
-CFLOPTS		=	-g 
+#CFLOPTS	=	-O -DUSESTRERROR
+CFLOPTS		=	-g -DUSESTRERROR
 CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
 LIBS		=	-l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
 XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
--- ./rm/Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./rm/Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -25,7 +25,7 @@ SDIR		=	$(PVMDIR)/rm
 BDIR		=	$(PVMDIR)/bin
 XDIR		=	$(BDIR)/$(PVM_ARCH)
 
-CFLOPTS		=	-g 
+CFLOPTS		=	-g -DUSESTRERROR
 CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 				-DIMA_$(PVM_ARCH) $(ARCHCFLAGS) \
 			$(DEBUG_FLAGS)
--- ./Makefile.aimk.dist	2007-07-06 11:53:07.000000000 -0700
+++ ./Makefile.aimk	2007-07-06 11:46:13.000000000 -0700
@@ -24,7 +24,7 @@ SHELL		=	/bin/sh
 #
 
 #CC			=	cc
-#CFLOPTS	=	-g 
+#CFLOPTS	=	-g -DUSESTRERROR
 #F77		=	f77
 #FFLOPTS	=	-g
 #PVMDIR		=	../..