[ovs-git] Open vSwitch: lib: Rename lib/pcap.h to avoid inclusion conflicts. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  2c78a3e62f282cb7f999ac84e035c29cd8b68d08 (commit)
      from  c58a0a6b329100b258e43c79aa4ea10f962bc47e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2c78a3e62f282cb7f999ac84e035c29cd8b68d08
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=2c78a3e62f282cb7f999ac84e035c29cd8b68d08
Author: Stephane A. Sezer <sas at cd80.net>
		
lib: Rename lib/pcap.h to avoid inclusion conflicts.
		
lib/pcap.h has a name that conflicts with /usr/include/pcap.h. When one
wants to include pcap.h from libpcap (i.e.: the one from /usr/include), one
may end up with pcap.h from openvswitch.

This change renames this header to pcap-file.h and updates all
references to this file.

This change was tested with `make distcheck`.

Signed-off-by: Stephane A. Sezer <sas at cd80.net>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 AUTHORS                     |    1 +
 lib/automake.mk             |    4 ++--
 lib/ofp-print.c             |    1 -
 lib/{pcap.c => pcap-file.c} |    2 +-
 lib/{pcap.h => pcap-file.h} |    6 +++---
 tests/test-flows.c          |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/{pcap.c => pcap-file.c} (99%)
 rename lib/{pcap.h => pcap-file.h} (92%)


hooks/post-receive
-- 
Open vSwitch