Changeset 1761

Timestamp:

03/14/12 15:01:34 (14 months ago)

Author:

salcock

Message:

• Make sure wandio.h can be found when building libpacketdump
• link_6.c no longer requires libtrace_int.h if the copy of the arphrd conversion function is made static

Location:

trunk/libpacketdump

Files:

• Makefile.am (modified) (1 diff)
• link_6.c (modified) (2 diffs)

trunk/libpacketdump/Makefile.am

@@ -171 +171 @@
 dist_plugin_DATA = $(TXT_PROTOCOLS)
 
-INCLUDES= @ADD_INCLS@ -I../lib 
+INCLUDES= @ADD_INCLS@ -I../lib -I../libwandio 
 
 # NOTE: You CANNOT add @LEXLIBS@ here, as they are statically compiled

trunk/libpacketdump/link_6.c

@@ -5 +5 @@
 
 #include "config.h"
-#include "libtrace_int.h"
+//#include "libtrace_int.h"
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -16 +16 @@
 /* Copied this here because this isn't currently part of our external API -
  * maybe we need to think about doing that? */
-libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
+static libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
         switch(arphrd) {
                 case ARPHRD_ETHER: return TRACE_TYPE_ETH;