Commit a9f1e2f6 authored by Philippe Gerum's avatar Philippe Gerum
Browse files

lib: fix unfortunate misnomer

parent 865d8f62
......@@ -22,11 +22,11 @@
#define __EVL__ 10 /* API version */
#define EVL_KABI_PREREQ 19
#define EVL_ABI_PREREQ 19
struct evl_version {
int api_level; /* libevl.so: __EVL__ */
int abi_level; /* core: EVL_KABI_PREREQ, -1 for ESHI */
int abi_level; /* core: EVL_ABI_PREREQ, -1 for ESHI */
const char *version_string;
};
......
......@@ -30,8 +30,8 @@
#define EVL_ABI_BASE 17
#else
#endif
#if !(EVL_KABI_PREREQ >= EVL_ABI_BASE && EVL_KABI_PREREQ <= EVL_ABI_LEVEL)
#error "kernel does not meet our ABI requirements (uapi vs EVL_KABI_PREREQ)"
#if !(EVL_ABI_PREREQ >= EVL_ABI_BASE && EVL_ABI_PREREQ <= EVL_ABI_LEVEL)
#error "kernel does not meet our ABI requirements (uapi vs EVL_ABI_PREREQ)"
#endif
static pthread_once_t init_once = PTHREAD_ONCE_INIT;
......@@ -109,8 +109,8 @@ static inline int generic_init(void)
core_info.abi_base = (__u32)-1;
}
if (EVL_KABI_PREREQ < core_info.abi_base ||
EVL_KABI_PREREQ > core_info.abi_current) {
if (EVL_ABI_PREREQ < core_info.abi_base ||
EVL_ABI_PREREQ > core_info.abi_current) {
fprintf(stderr,
"evl: ABI mismatch, see -ENOEXEC at https://evlproject.org/"
"core/user-api/thread/#evl_attach_self\n");
......
......@@ -18,7 +18,7 @@ struct evl_version evl_get_version(void)
{
return (struct evl_version){
.api_level = __EVL__,
.abi_level = EVL_KABI_PREREQ,
.abi_level = EVL_ABI_PREREQ,
.version_string = "evl." LIBSERIAL git_hash,
};
}
......@@ -79,7 +79,7 @@ int main(int argc, char *const argv[])
case 'V':
printf("%s [requires ABI %d]\n",
evl_get_version().version_string,
EVL_KABI_PREREQ);
EVL_ABI_PREREQ);
exit(0);
case '?':
usage();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment