Skip to content
Permalink
Browse files
resloved conflict
  • Loading branch information
xuzhenbao committed Feb 21, 2022
2 parents 4908811 + c790d00 commit 7ee481e1567c40073f0c7836ae59c33d59101d7b
Showing 1 changed file with 0 additions and 2 deletions.
@@ -150,15 +150,13 @@ const char* celix_strerror(celix_status_t status);
#define CELIX_FRAMEWORK_EXCEPTION (CELIX_START_ERROR + 7)
#define CELIX_FILE_IO_EXCEPTION (CELIX_START_ERROR + 8)
#define CELIX_SERVICE_EXCEPTION (CELIX_START_ERROR + 9)

/*!
* Exception indicating a problem with a interceptor
*/
#define CELIX_INTERCEPTOR_EXCEPTION (CELIX_START_ERROR + 10)

#define CELIX_ENOMEM ENOMEM


/**
* \}
*/

0 comments on commit 7ee481e

Please sign in to comment.