diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1997-04-24 02:24:22 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1997-04-24 02:24:22 +0000 |
| commit | 0575a833b91b02773965ddb7ae5933af25f91b3c (patch) | |
| tree | 7576e2d2816b36a35c8540319e0a81a730985e7e /comms | |
| parent | #include <sys/types.h> before <dirent.h>. (diff) | |
Merge two files that were patching the same file (xcept/script.h). In
xcept/scripts.h (note the `s'), #include <sys/types.h> before <dirent.h>.
Notes
Notes:
svn path=/head/; revision=6280
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/xcept/files/patch-ae | 8 | ||||
| -rw-r--r-- | comms/xcept/files/patch-af | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/comms/xcept/files/patch-ae b/comms/xcept/files/patch-ae index 2d9b6d596bd4..d5e99520061a 100644 --- a/comms/xcept/files/patch-ae +++ b/comms/xcept/files/patch-ae @@ -99,6 +99,14 @@ --- xcept/script.c.orig Fri Sep 24 16:07:29 1993 +++ xcept/script.c Sun Sep 1 14:08:13 1996 +@@ -809,7 +809,6 @@ + if(a->value == b->value) + return error("pc: %d - variables don't differ!\n",pc); + len = strlen(a->value) + strlen(b->value) + 1; +- free(a->value); + if(!(a->value = ralloc(a->value,len))) return errorp("realloc\n"); + strcat(a->value,b->value); + @@ -1082,7 +1082,8 @@ printf( "%s", b->value ); fflush(stdout); diff --git a/comms/xcept/files/patch-af b/comms/xcept/files/patch-af index 002dbba6106b..601e917b430e 100644 --- a/comms/xcept/files/patch-af +++ b/comms/xcept/files/patch-af @@ -1,10 +1,10 @@ ---- xcept/script.c.orig Sun Sep 1 18:24:46 1996 -+++ xcept/script.c Sun Sep 1 18:32:08 1996 -@@ -809,7 +809,6 @@ - if(a->value == b->value) - return error("pc: %d - variables don't differ!\n",pc); - len = strlen(a->value) + strlen(b->value) + 1; -- free(a->value); - if(!(a->value = ralloc(a->value,len))) return errorp("realloc\n"); - strcat(a->value,b->value); - +--- ./xcept/scripts.c.org Thu Apr 14 10:21:58 1994 ++++ ./xcept/scripts.c Wed Apr 23 19:08:32 1997 +@@ -36,6 +36,7 @@ + #include <stdio.h> + #include <errno.h> + #include <string.h> ++#include <sys/types.h> + #include <dirent.h> + #include "scripts.h" + |