fix token pasting issue.

regen patch.
This commit is contained in:
espie 2004-01-05 01:23:09 +00:00
parent ef7ca16a98
commit 2946b8af0e
3 changed files with 29 additions and 5 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_epic.1,v 1.4 2002/06/30 18:23:31 brad Exp $
--- doc/epic.1.orig Mon Dec 4 19:31:31 2000
+++ doc/epic.1 Tue Dec 12 17:20:48 2000
@@ -153,7 +153,6 @@
$OpenBSD: patch-doc_epic.1,v 1.5 2004/01/05 01:23:09 espie Exp $
--- doc/epic.1.orig 2000-12-05 01:31:31.000000000 +0100
+++ doc/epic.1 2004-01-05 02:15:39.000000000 +0100
@@ -153,7 +153,6 @@ Any item can be omitted by leaving the f
.Ss "The Screen:"
The screen is split into two parts, separated by an inverse-video status line (if supported).
The upper (larger) part of the screen displays responses from the
@ -9,7 +9,7 @@ $OpenBSD: patch-doc_epic.1,v 1.4 2002/06/30 18:23:31 brad Exp $
server.
The lower part of the screen (a single line) accepts keyboard input.
.sp
@@ -278,8 +277,6 @@
@@ -278,8 +277,6 @@ Overrides the default home page in
.It Ev TERM
The type of terminal emulation to use
.El

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_info_c_sh_in,v 1.1 2004/01/05 01:23:09 espie Exp $
--- source/info.c.sh.in.orig 2004-01-05 02:19:12.000000000 +0100
+++ source/info.c.sh.in 2004-01-05 02:19:35.000000000 +0100
@@ -20,7 +20,7 @@ cat > info.c << __E__O__F__
*/
#ifdef __STDC__
-#define my_paste(x, y, z) x ## y ## z
+#define my_paste(x, y, z) x y z
#else
#define my_paste(x, y, z) x/**/y/**/z
#endif

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_status_c,v 1.1 2004/01/05 01:23:09 espie Exp $
--- source/status.c.orig 2004-01-05 02:16:48.000000000 +0100
+++ source/status.c 2004-01-05 02:17:01.000000000 +0100
@@ -36,7 +36,7 @@
* Maximum number of "%" expressions in a status line format. If you change
* this number, you must manually change the sprintf() in make_status
*/
-#define STATUS_FUNCTION(x) static Char * ## x (Window *window, int map, int key)
+#define STATUS_FUNCTION(x) static Char * x (Window *window, int map, int key)
#define MAX_FUNCTIONS 40
#define MAX_STATUS_USER 39