diff --git a/openair-cn/S6A/s6a_defs.h b/openair-cn/S6A/s6a_defs.h
index c9302f06e638abaeaaf0fafb6d57130c807056ab..d47706de4be2be14b021adf30bc49ef309ea53ca 100644
--- a/openair-cn/S6A/s6a_defs.h
+++ b/openair-cn/S6A/s6a_defs.h
@@ -195,7 +195,48 @@ int s6a_parse_subscription_data(struct avp *avp_subscription_data,
                                 subscription_data_t *subscription_data);
 
 int s6a_parse_experimental_result(struct avp *avp, s6a_experimental_result_t *ptr);
+#ifndef CMAKER
 inline char *experimental_retcode_2_string(uint32_t ret_code);
 inline char *retcode_2_string(uint32_t ret_code);
+#else
+inline char *experimental_retcode_2_string(uint32_t ret_code)
+{
+    switch(ret_code) {
+        /* Experimental-Result-Codes */
+        case DIAMETER_ERROR_USER_UNKNOWN:
+            return "DIAMETER_ERROR_USER_UNKNOWN";
+        case DIAMETER_ERROR_ROAMING_NOT_ALLOWED:
+            return "DIAMETER_ERROR_ROAMING_NOT_ALLOWED";
+        case DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION:
+            return "DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION";
+        case DIAMETER_ERROR_RAT_NOT_ALLOWED:
+            return "DIAMETER_ERROR_RAT_NOT_ALLOWED";
+        case DIAMETER_ERROR_EQUIPMENT_UNKNOWN:
+            return "DIAMETER_ERROR_EQUIPMENT_UNKNOWN";
+        case DIAMETER_ERROR_UNKOWN_SERVING_NODE:
+            return "DIAMETER_ERROR_UNKOWN_SERVING_NODE";
+        case DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE:
+            return "DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE";
+        default:
+            break;
+    }
+    return "DIAMETER_AVP_UNSUPPORTED";
+}
+
+inline char *retcode_2_string(uint32_t ret_code)
+{
+    switch(ret_code) {
+        case ER_DIAMETER_SUCCESS:
+            return "DIAMETER_SUCCESS";
+        case ER_DIAMETER_MISSING_AVP:
+            return "DIAMETER_MISSING_AVP";
+        case ER_DIAMETER_INVALID_AVP_VALUE:
+            return "DIAMETER_INVALID_AVP_VALUE";
+        default:
+            break;
+    }
+    return "DIAMETER_AVP_UNSUPPORTED";
+}
+#endif
 
 #endif /* S6A_DEFS_H_ */
diff --git a/openair-cn/S6A/s6a_error.c b/openair-cn/S6A/s6a_error.c
index 83f3be02b5c071a2e47c49e760ca6c88bf9d66b1..11a9d7cfa2573bf1ae815f8d6709bf9b4404eab8 100644
--- a/openair-cn/S6A/s6a_error.c
+++ b/openair-cn/S6A/s6a_error.c
@@ -69,6 +69,7 @@ int s6a_parse_experimental_result(struct avp *avp, s6a_experimental_result_t *pt
     return 0;
 }
 
+#ifndef CMAKER
 inline char *experimental_retcode_2_string(uint32_t ret_code)
 {
     switch(ret_code) {
@@ -107,4 +108,4 @@ inline char *retcode_2_string(uint32_t ret_code)
     }
     return "DIAMETER_AVP_UNSUPPORTED";
 }
-
+#endif