summaryrefslogtreecommitdiff
path: root/wm/tvtwm/patches/patch-ak
blob: 93c4fac224b12e5cfe02443b4d2bca3fd8308dcc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
$NetBSD: patch-ak,v 1.3 2017/01/04 12:20:07 jperkin Exp $

Ensure the local yywrap is used.

--- lex.l.orig	1993-03-10 20:57:51.000000000 +0000
+++ lex.l
@@ -37,12 +37,35 @@
  ***********************************************************************/
 
 /* #include <stdio.h> */		/* lex already includes stdio.h */
+#include "twm.h"
 #include "gram.h"
 #include "parse.h"
+#undef yywrap
 extern char *ProgramName;
 
 extern int ParseError;
 
+#if defined(__NetBSD__)
+#undef YY_INPUT
+#define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
+int
+doinput (buf, size)
+char *buf;
+int size;
+{
+        int c;
+
+        if (size == 0)
+                return (0);
+
+        if ((c = (*twmInputFunc)()) <= 0)
+                return (0);
+
+        buf[0] = c;
+        return (1);
+}
+#endif
+
 %}
 
 string				\"([^"]|\\.)*\"
@@ -94,7 +117,10 @@ number				[0-9]+
 				}
 %%
 #ifndef yywrap
-yywrap() { return(1);}
+int yywrap() { return(1);}
+#endif
+#if defined(__NetBSD__) || defined(__APPLE__)
+int yylineno;
 #endif
 
 #undef unput