summaryrefslogtreecommitdiff
path: root/net/irrtoolset-nox11/patches/patch-bt
blob: 210dda4d8b8518b7ef71ffcf236137b3f726c9a1 (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
$NetBSD: patch-bt,v 1.2 2005/08/26 08:41:46 spz Exp $

--- src/RtConfig/command.y.orig	2004-07-30 12:58:11.000000000 +0200
+++ src/RtConfig/command.y
@@ -56,7 +56,11 @@
 
 #include "config.h"
 
+#if (__GNUC__ > 2)
 #include <ostream>
+#else
+#include <ostream.h>
+#endif
 #include <cstring>
 #include <cstdlib>
 #include <cctype>
@@ -174,7 +178,7 @@ input_line: import_line
 | pkt_filter_line
 | outbound_pkt_filter_line
 | cisco_map_name_line
-//| junos_policy_name_line
+| junos_policy_name_line
 | cisco_map_inc_line
 | cisco_map_start_line
 | cisco_access_list_no_line
@@ -333,14 +337,12 @@ cisco_map_name_line: KW_SET KW_CISCO_MAP
 		   << CiscoConfig::mapNameFormat << "'" << std::endl;
 }
 ;
-/*
 junos_policy_name_line: KW_SET KW_JUNOS_POLICY_NAME '=' TKN_STR {
    strcpy(JunosConfig::mapNameFormat, $4);
    Trace(TR_INPUT) << "RtConfig: junos_policy_name '"
 		   << JunosConfig::mapNameFormat << "'" << endl;
 }
 ;
-*/
 cisco_map_inc_line: KW_SET KW_CISCO_MAP_INC '=' TKN_INT {
    CiscoConfig::mapIncrements = $4;
    Trace(TR_INPUT) << "RtConfig: cisco_map_increment_by '"