X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fjapi%2Fjava%2Fjvpp-common%2Fjvpp_common.h;h=e12141b08ba013669496085bdddf45e9e55201ad;hb=413f4a5b2123c1625d615315db293a080078482b;hp=14027a96f78b6ee32021ecd2a39e9c86dfbe9ceb;hpb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;p=vpp.git

diff --git a/extras/japi/java/jvpp-common/jvpp_common.h b/extras/japi/java/jvpp-common/jvpp_common.h
index 14027a96f78..e12141b08ba 100644
--- a/extras/japi/java/jvpp-common/jvpp_common.h
+++ b/extras/japi/java/jvpp-common/jvpp_common.h
@@ -17,6 +17,7 @@
 //
 #include <vppinfra/types.h>
 #include <vlibapi/api.h>
+#include <vlibapi/api_types.h>
 #include <vlibmemory/api.h>
 #include <jni.h>
 
@@ -43,11 +44,11 @@ typedef struct {
 extern jvpp_main_t jvpp_main __attribute__((aligned (64)));
 
 static_always_inline u32 vppjni_get_context_id(jvpp_main_t * jm) {
-    return __sync_add_and_fetch(&jm->context_id, 1);
+    return clib_atomic_add_fetch(&jm->context_id, 1);
 }
 
 static_always_inline void vppjni_lock(jvpp_main_t * jm, u32 tag) {
-    while (__sync_lock_test_and_set(&jm->lock, 1))
+    while (clib_atomic_test_and_set(&jm->lock))
         ;
     jm->tag = tag;
 }