From e2402c00000fa9de35def71ee9f37f3ee551b98a Mon Sep 17 00:00:00 2001 From: Ari Koivula Date: Fri, 15 Jan 2016 19:37:40 +0200 Subject: [PATCH] Remove kva_api_get versioning. We have soname versioning now, so we should focus on getting that right instead. This also serves as an example of correctly incrementing the lib-version. --- configure.ac | 4 ++-- src/kvazaar.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0b4da3a1..2f9b4aa2 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ AC_CONFIG_SRCDIR([src/encmain.c]) # - Increment when making new releases and major or minor was not changed since last release. # # Here is a somewhat sane guide to lib versioning: http://apr.apache.org/versioning.html -ver_major=2 -ver_minor=4 +ver_major=3 +ver_minor=0 ver_release=0 # not used, but it prevents configure from adding a lot of defines to the CFLAGS diff --git a/src/kvazaar.h b/src/kvazaar.h index 0959391f..acf39f32 100644 --- a/src/kvazaar.h +++ b/src/kvazaar.h @@ -496,10 +496,6 @@ typedef struct kvz_api { kvz_frame_info *info_out); } kvz_api; -// Append API version to the getters name to prevent linking against incompatible versions. -#define KVZ_API_CONCAT(func, version) func ## _apiv ## version -#define KVZ_API_EXPAND_VERSION(func, version) KVZ_API_CONCAT(func, version) -#define kvz_api_get KVZ_API_EXPAND_VERSION(kvz_api_get, KVZ_API_VERSION) KVZ_PUBLIC const kvz_api * kvz_api_get(int bit_depth);