[Xorp-hackers] [greearb/xorp.ct] 5d24b7: bool: Don't redefine 'bool' type if stdbool.h exis...
GitHub
noreply at github.com
Wed Mar 14 14:43:54 PDT 2012
Branch: refs/heads/master
Home: https://github.com/greearb/xorp.ct
Commit: 5d24b726961aceff322e7734c9a54248a2f36b43
https://github.com/greearb/xorp.ct/commit/5d24b726961aceff322e7734c9a54248a2f36b43
Author: Ben Greear <greearb at candelatech.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M xorp/libxorp/xorp.h
M xorp/site_scons/config/allconfig.py
Log Message:
-----------
bool: Don't redefine 'bool' type if stdbool.h exists.
Helps fix some problems seen on BSD system.
Signed-off-by: Ben Greear <greearb at candelatech.com>
Commit: c7521b5979e72edec3b6a4004ec6cd10ce0b2fb8
https://github.com/greearb/xorp.ct/commit/c7521b5979e72edec3b6a4004ec6cd10ce0b2fb8
Author: Ben Greear <greearb at candelatech.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M xorp/fea/data_plane/io/io_link_pcap.hh
Log Message:
-----------
netbsd: Work around pcap header file bugs.
This fixes this error:
g++ -o obj/x86_64-unknown-netbsd6.0./fea/data_plane/io/io_link_pcap.os -c -O2 -g3 -Werror -W -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wcast-align -Woverloaded-virtual -ftemplate-depth-25 -pipe -DXORP_BUILDINFO -fPIC -DXRL_PF=120 -DXORP_VERSION=1.8.5 -Iobj/x86_64-unknown-netbsd6.0. -I. -I. fea/data_plane/io/io_link_pcap.cc
In file included from fea/data_plane/io/io_link_pcap.hh:36:0,
from fea/data_plane/io/io_link_pcap.cc:45:
/usr/include/pcap/bpf.h:382:8: error: previous declaration of 'u_int bpf_filter(const bpf_insn*, const u_char*, u_int, u_int)' with 'C++' linkage
/usr/include/pcap.h:354:71: error: conflicts with new declaration with 'C' linkage
/usr/include/pcap/bpf.h:381:6: error: previous declaration of 'int bpf_validate(const bpf_insn*, int)' with 'C++' linkage
/usr/include/pcap.h:355:51: error: conflicts with new declaration with 'C' linkage
scons: *** [obj/x86_64-unknown-netbsd6.0./fea/data_plane/io/io_link_pcap.os] Error 1
scons: building terminated because of errors.
Signed-off-by: Ben Greear <greearb at candelatech.com>
Commit: 5f48b66c0dad8708d399529d13288228f5657c1e
https://github.com/greearb/xorp.ct/commit/5f48b66c0dad8708d399529d13288228f5657c1e
Author: Ben Greear <greearb at candelatech.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M xorp/SConstruct
M xorp/rtrmgr/boot.ll
M xorp/rtrmgr/op_commands.cc
M xorp/rtrmgr/op_commands.ll
M xorp/rtrmgr/template.ll
Log Message:
-----------
bsd/lex: Newer BSD doesn't need lex hack, so make user enable it explicitly.
This fixes compile on newer BSD..will see if it works elsewhere!
Signed-off-by: Ben Greear <greearb at candelatech.com>
Compare: https://github.com/greearb/xorp.ct/compare/3b5804d...5f48b66
More information about the Xorp-hackers
mailing list