X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ffunc-status.h;h=e5aca4aac340953b744ed89a45a0f353d304a34e;hb=520cdc8260ea033f1c9f54b87d93fcb034ae8472;hp=ed3dd0ccdc1aa217de35a376a4fdc939959048dc;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/func-status.h b/src/lib/func-status.h
index ed3dd0cc..e5aca4aa 100644
--- a/src/lib/func-status.h
+++ b/src/lib/func-status.h
@@ -23,27 +23,21 @@
  * SOFTWARE.
  */
 
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 /*
  * Aliases without a `__` prefix for internal code: this is just easier
  * to read.
  */
-#define BT_FUNC_STATUS_OVERFLOW		__BT_FUNC_STATUS_OVERFLOW
-#define BT_FUNC_STATUS_INVALID_PARAMS	__BT_FUNC_STATUS_INVALID_PARAMS
+#define BT_FUNC_STATUS_AGAIN		__BT_FUNC_STATUS_AGAIN
+#define BT_FUNC_STATUS_END		__BT_FUNC_STATUS_END
+#define BT_FUNC_STATUS_ERROR		__BT_FUNC_STATUS_ERROR
+#define BT_FUNC_STATUS_INTERRUPTED	__BT_FUNC_STATUS_INTERRUPTED
 #define BT_FUNC_STATUS_INVALID_OBJECT	__BT_FUNC_STATUS_INVALID_OBJECT
 #define BT_FUNC_STATUS_MEMORY_ERROR	__BT_FUNC_STATUS_MEMORY_ERROR
-#define BT_FUNC_STATUS_LOADING_ERROR	__BT_FUNC_STATUS_LOADING_ERROR
-#define BT_FUNC_STATUS_ERROR		__BT_FUNC_STATUS_ERROR
-#define BT_FUNC_STATUS_OK		__BT_FUNC_STATUS_OK
-#define BT_FUNC_STATUS_END		__BT_FUNC_STATUS_END
 #define BT_FUNC_STATUS_NOT_FOUND	__BT_FUNC_STATUS_NOT_FOUND
-#define BT_FUNC_STATUS_AGAIN		__BT_FUNC_STATUS_AGAIN
-#define BT_FUNC_STATUS_UNSUPPORTED	__BT_FUNC_STATUS_UNSUPPORTED
-#define BT_FUNC_STATUS_CANCELED		__BT_FUNC_STATUS_CANCELED
-
-#include <babeltrace2/undef-func-status.h>
+#define BT_FUNC_STATUS_OK		__BT_FUNC_STATUS_OK
+#define BT_FUNC_STATUS_OVERFLOW_ERROR	__BT_FUNC_STATUS_OVERFLOW_ERROR
 
 #endif /* BABELTRACE_FUNC_STATUS_INTERNAL_H */