Changeset 5097267


Ignore:
Timestamp:
12/07/18 13:52:59 (23 months ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
9c46b65
Parents:
c79c7fd (diff), 5964f52 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'fix86' into develop

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    rdab79f2 r5964f52  
    4343export SAVED_CFLAGS:=$(CFLAGS)
    4444export SAVED_CXXFLAGS:=$(CXXFLAGS)
     45export SAVED_CPPFLAGS:=$(CPPFLAGS)
     46export SAVED_LDFLAGS:=$(LDFLAGS)
    4547include $(RTE_SDK)/mk/rte.vars.mk
    4648# We need to add -Wl before the linker otherwise this breaks our build
     
    5052export CFLAGS += $(SAVED_CFLAGS)
    5153export CXXFLAGS += $(SAVED_CXXFLAGS)
     54export CPPFLAGS:=$(SAVED_CPPFLAGS)
     55export LDFLAGS += $(SAVED_LDFLAGS)
    5256endif
    5357
  • lib/format_dpdk.c

    r2193905 r5141cd6  
    21532153                                /* The packet should always be finished */
    21542154                                if (packet->buf_control != TRACE_CTRL_PACKET) {
    2155                                         trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Expected packet "
     2155                                        trace_set_err(trace, TRACE_ERR_BAD_PACKET, "Expected packet "
    21562156                                                "buffer to be empty in dpdk_trace_event()\n");
    2157                                         return -1;
     2157                                        event.type = TRACE_EVENT_TERMINATE;
     2158                                        return event;
    21582159                                }
    21592160                                free(packet->buffer);
Note: See TracChangeset for help on using the changeset viewer.