Changeset 5097267
- Timestamp:
- 12/07/18 13:52:59 (2 years ago)
- 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. - Location:
- lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/Makefile.am
rdab79f2 r5964f52 43 43 export SAVED_CFLAGS:=$(CFLAGS) 44 44 export SAVED_CXXFLAGS:=$(CXXFLAGS) 45 export SAVED_CPPFLAGS:=$(CPPFLAGS) 46 export SAVED_LDFLAGS:=$(LDFLAGS) 45 47 include $(RTE_SDK)/mk/rte.vars.mk 46 48 # We need to add -Wl before the linker otherwise this breaks our build … … 50 52 export CFLAGS += $(SAVED_CFLAGS) 51 53 export CXXFLAGS += $(SAVED_CXXFLAGS) 54 export CPPFLAGS:=$(SAVED_CPPFLAGS) 55 export LDFLAGS += $(SAVED_LDFLAGS) 52 56 endif 53 57 -
lib/format_dpdk.c
r2193905 r5141cd6 2153 2153 /* The packet should always be finished */ 2154 2154 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 " 2156 2156 "buffer to be empty in dpdk_trace_event()\n"); 2157 return -1; 2157 event.type = TRACE_EVENT_TERMINATE; 2158 return event; 2158 2159 } 2159 2160 free(packet->buffer);
Note: See TracChangeset
for help on using the changeset viewer.