eal: fix C++ include

C++ files could not include some headers because:

* "new" is a keyword in C++, so can't be a variable name
* there is no automatic casting to/from void *

Fixes: 184104fc6121 ("ticketlock: introduce fair ticket based locking")
Fixes: 032a7e5499a0 ("trace: implement provider payload")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/lib/eal/include/generic/rte_ticketlock.h b/lib/eal/include/generic/rte_ticketlock.h
index c1b8808f5191ef166df1f3c063ae1d252e073c3f..693c67b5171be9b381664c7ea05fb2fd36579ea1 100644 (file)
--- a/lib/eal/include/generic/rte_ticketlock.h
+++ b/lib/eal/include/generic/rte_ticketlock.h
@@ -91,13 +91,13 @@ rte_ticketlock_unlock(rte_ticketlock_t *tl)
 static inline int
 rte_ticketlock_trylock(rte_ticketlock_t *tl)
 {
-       rte_ticketlock_t old, new;
-       old.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED);
-       new.tickets = old.tickets;
-       new.s.next++;
-       if (old.s.next == old.s.current) {
-               if (__atomic_compare_exchange_n(&tl->tickets, &old.tickets,
-                   new.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
+       rte_ticketlock_t oldl, newl;
+       oldl.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED);
+       newl.tickets = oldl.tickets;
+       newl.s.next++;
+       if (oldl.s.next == oldl.s.current) {
+               if (__atomic_compare_exchange_n(&tl->tickets, &oldl.tickets,
+                   newl.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
                        return 1;
        }
 

diff --git a/lib/eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h
index e226f073f7ad589a99dc49c4e453483981c95e89..0f8700974f3bb0b5ecc9b315f82640f928dbd8b2 100644 (file)
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -370,7 +370,7 @@ do { \
 do { \
        if (unlikely(in == NULL)) \
                return; \
-       rte_strscpy(mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX); \
+       rte_strscpy((char *)mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX); \
        mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX); \
 } while (0)