Changeset b3edbe9


Ignore:
Timestamp:
03/14/12 15:01:34 (9 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
91ea76c
Parents:
bd37451
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:
libpacketdump
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libpacketdump/Makefile.am

    re224862 rb3edbe9  
    171171dist_plugin_DATA = $(TXT_PROTOCOLS)
    172172
    173 INCLUDES= @ADD_INCLS@ -I../lib
     173INCLUDES= @ADD_INCLS@ -I../lib -I../libwandio
    174174
    175175# NOTE: You CANNOT add @LEXLIBS@ here, as they are statically compiled
  • libpacketdump/link_6.c

    r4c90362 rb3edbe9  
    55
    66#include "config.h"
    7 #include "libtrace_int.h"
     7//#include "libtrace_int.h"
    88#include <sys/types.h>
    99#include <netinet/in.h>
     
    1616/* Copied this here because this isn't currently part of our external API -
    1717 * maybe we need to think about doing that? */
    18 libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
     18static libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
    1919        switch(arphrd) {
    2020                case ARPHRD_ETHER: return TRACE_TYPE_ETH;
Note: See TracChangeset for help on using the changeset viewer.