Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BIRD Internet Routing Daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
labs
BIRD Internet Routing Daemon
Commits
a32a7b58
Commit
a32a7b58
authored
Dec 10, 2017
by
Ondřej Zajíček
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lib: Fix macro/keyword collisions
Old code breaks with some versions of bison
parent
7fc55925
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
lib/buffer.h
lib/buffer.h
+5
-1
lib/flowspec.h
lib/flowspec.h
+1
-1
lib/timer.h
lib/timer.h
+1
-1
proto/static/static.h
proto/static/static.h
+1
-1
No files found.
lib/buffer.h
View file @
a32a7b58
...
...
@@ -13,10 +13,14 @@
#include "lib/resource.h"
#include "sysdep/config.h"
#define BUFFER(type) struct { type *data; uint used, size; }
#define BUFFER
_
(type) struct { type *data; uint used, size; }
#define BUFFER_TYPE(v) typeof(* (v).data)
#define BUFFER_SIZE(v) ((v).size * sizeof(* (v).data))
#ifndef PARSER
#define BUFFER(type) BUFFER_(type)
#endif
#define BUFFER_INIT(v,pool,isize) \
({ \
(v).used = 0; \
...
...
lib/flowspec.h
View file @
a32a7b58
...
...
@@ -91,7 +91,7 @@ const byte *flow6_next_part(const byte *pos, const byte *end);
/* A data structure for keep a state of flow builder */
struct
flow_builder
{
BUFFER
(
byte
)
data
;
BUFFER
_
(
byte
)
data
;
enum
flow_type
this_type
;
enum
flow_type
last_type
;
u16
last_op_offset
;
/* Position of last operator in data.data */
...
...
lib/timer.h
View file @
a32a7b58
...
...
@@ -30,7 +30,7 @@ typedef struct timer
struct
timeloop
{
BUFFER
(
timer
*
)
timers
;
BUFFER
_
(
timer
*
)
timers
;
btime
last_time
;
btime
real_time
;
};
...
...
proto/static/static.h
View file @
a32a7b58
...
...
@@ -25,7 +25,7 @@ struct static_proto {
struct
proto
p
;
struct
event
*
event
;
/* Event for announcing updated routes */
BUFFER
(
struct
static_route
*
)
marked
;
/* Routes marked for reannouncement */
BUFFER
_
(
struct
static_route
*
)
marked
;
/* Routes marked for reannouncement */
rtable
*
igp_table_ip4
;
/* Table for recursive IPv4 next hop lookups */
rtable
*
igp_table_ip6
;
/* Table for recursive IPv6 next hop lookups */
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment