diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/mythread.h | 2 | ||||
| -rw-r--r-- | src/common/tuklib_progname.c | 2 | ||||
| -rw-r--r-- | src/common/tuklib_progname.h | 2 | ||||
| -rw-r--r-- | src/liblzma/Makefile.am | 2 | ||||
| -rw-r--r-- | src/liblzma/api/lzma/version.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/common/mythread.h b/src/common/mythread.h index a0dced19..37b5216b 100644 --- a/src/common/mythread.h +++ b/src/common/mythread.h @@ -108,7 +108,7 @@ mythread_sigmask(int how, const sigset_t *restrict set, // If clock_gettime() isn't available, use gettimeofday() from <sys/time.h> // as a fallback. gettimeofday() is in SUSv2 and thus is supported on all // relevant POSIX systems. -#if !defined(HAVE_CLOCK_GETTIME) +#ifndef HAVE_CLOCK_GETTIME # include <sys/time.h> #endif diff --git a/src/common/tuklib_progname.c b/src/common/tuklib_progname.c index 7cb7e203..e2ef4e55 100644 --- a/src/common/tuklib_progname.c +++ b/src/common/tuklib_progname.c @@ -14,7 +14,7 @@ #include <string.h> -#if !HAVE_DECL_PROGRAM_INVOCATION_NAME +#ifndef HAVE_PROGRAM_INVOCATION_NAME char *progname = NULL; #endif diff --git a/src/common/tuklib_progname.h b/src/common/tuklib_progname.h index 791b1251..bb80f25e 100644 --- a/src/common/tuklib_progname.h +++ b/src/common/tuklib_progname.h @@ -18,7 +18,7 @@ TUKLIB_DECLS_BEGIN -#if HAVE_DECL_PROGRAM_INVOCATION_NAME +#ifdef HAVE_PROGRAM_INVOCATION_NAME # define progname program_invocation_name #else # define progname TUKLIB_SYMBOL(tuklib_progname) diff --git a/src/liblzma/Makefile.am b/src/liblzma/Makefile.am index 97396c08..0751f7a6 100644 --- a/src/liblzma/Makefile.am +++ b/src/liblzma/Makefile.am @@ -24,7 +24,7 @@ liblzma_la_CPPFLAGS = \ -I$(top_srcdir)/src/liblzma/simple \ -I$(top_srcdir)/src/common \ -DTUKLIB_SYMBOL_PREFIX=lzma_ -liblzma_la_LDFLAGS = -no-undefined -version-info 9:0:4 +liblzma_la_LDFLAGS = -no-undefined -version-info 10:99:5 EXTRA_DIST += liblzma_generic.map liblzma_linux.map validate_map.sh if COND_SYMVERS_GENERIC diff --git a/src/liblzma/api/lzma/version.h b/src/liblzma/api/lzma/version.h index 7d37130f..c148340a 100644 --- a/src/liblzma/api/lzma/version.h +++ b/src/liblzma/api/lzma/version.h @@ -21,9 +21,9 @@ * Version number split into components */ #define LZMA_VERSION_MAJOR 5 -#define LZMA_VERSION_MINOR 4 +#define LZMA_VERSION_MINOR 5 #define LZMA_VERSION_PATCH 0 -#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE +#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_ALPHA #ifndef LZMA_VERSION_COMMIT # define LZMA_VERSION_COMMIT "" |