diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2021-03-05 12:23:02 -0600 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2021-03-05 12:23:28 -0600 |
| commit | 0335eb08db86ff2eb8983cabcb4ca697d4ff6c07 (patch) | |
| tree | a88e8e06510f563004e525593acbe89498fbbddd | |
| parent | d1ba9fcdadcd3a2e45a9cdc5aca9b6861601a6f4 (diff) | |
| download | libsoup-0335eb08db86ff2eb8983cabcb4ca697d4ff6c07.tar.gz | |
Remove 2.99 version macros
The first API will be 3.0
| -rw-r--r-- | docs/reference/libsoup-3.0-sections.txt | 4 | ||||
| -rwxr-xr-x | libsoup/generate-version-header.py | 1 | ||||
| -rw-r--r-- | libsoup/soup-version.h.in | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt index 3c481939..0d996bae 100644 --- a/docs/reference/libsoup-3.0-sections.txt +++ b/docs/reference/libsoup-3.0-sections.txt @@ -818,16 +818,12 @@ SOUP_CHECK_VERSION <SUBSECTION> SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_MAX_ALLOWED -SOUP_VERSION_2_99 SOUP_VERSION_3_0 <SUBSECTION Private> SOUP_AVAILABLE_IN_ALL -SOUP_AVAILABLE_IN_2_99 SOUP_AVAILABLE_IN_3_0 SOUP_DEPRECATED_IN_3_0 -SOUP_DEPRECATED_IN_2_99 SOUP_DEPRECATED_IN_3_0_FOR -SOUP_DEPRECATED_IN_2_99_FOR SOUP_ENCODE_VERSION SOUP_VAR SOUP_VERSION_CUR_STABLE diff --git a/libsoup/generate-version-header.py b/libsoup/generate-version-header.py index 8dbf413d..0bd91ec5 100755 --- a/libsoup/generate-version-header.py +++ b/libsoup/generate-version-header.py @@ -17,7 +17,6 @@ versions = [] if major == 2: # Specific to 3.x dev releases - versions.append((2, 99)) versions.append((3, 0)) else: minor_max = minor if minor != 0 and is_stable(minor) else minor + 1 diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in index b20976a7..486bafc9 100644 --- a/libsoup/soup-version.h.in +++ b/libsoup/soup-version.h.in @@ -51,7 +51,11 @@ G_BEGIN_DECLS * this means the next stable target */ #if (SOUP_MINOR_VERSION % 2) +#if (SOUP_MAJOR_VERSION == 2) +#define SOUP_VERSION_CUR_STABLE (G_ENCODE_VERSION (3, 0)) +#else #define SOUP_VERSION_CUR_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION + 1)) +#endif #else #define SOUP_VERSION_CUR_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION)) #endif @@ -82,8 +86,8 @@ G_BEGIN_DECLS #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_MIN_REQUIRED #error "SOUP_VERSION_MAX_ALLOWED must be >= SOUP_VERSION_MIN_REQUIRED" #endif -#if SOUP_VERSION_MIN_REQUIRED < SOUP_VERSION_2_99 -#error "SOUP_VERSION_MIN_REQUIRED must be >= SOUP_VERSION_2_99" +#if SOUP_VERSION_MIN_REQUIRED < SOUP_VERSION_3_0 +#error "SOUP_VERSION_MIN_REQUIRED must be >= SOUP_VERSION_3_0" #endif #define SOUP_AVAILABLE_IN_ALL _SOUP_EXTERN |