...
 
Commits (9)
Acknowledgements: libesedb
Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
......@@ -10,7 +10,7 @@
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
......@@ -111,7 +111,7 @@ the following:
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
......
This diff is collapsed.
This diff is collapsed.
......@@ -37,13 +37,12 @@ DPKG_FILES = \
dpkg/compat \
dpkg/control \
dpkg/copyright \
dpkg/copyright.in \
dpkg/rules \
dpkg/libesedb.docs \
dpkg/libesedb-dev.docs \
dpkg/libesedb-python.docs \
dpkg/libesedb-python3.docs \
dpkg/libesedb-tools.docs \
dpkg/libesedb.install \
dpkg/libesedb-dev.install \
dpkg/libesedb-python.install \
dpkg/libesedb-python3.install \
dpkg/libesedb-tools.install \
dpkg/source/format
GETTEXT_FILES = \
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -120,7 +120,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
CONFIG_CLEAN_FILES = include/libesedb/definitions.h \
include/libesedb/features.h include/libesedb/types.h \
dpkg/changelog dpkg/copyright libesedb.pc libesedb.spec
dpkg/changelog libesedb.pc libesedb.spec
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -185,7 +185,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -209,7 +209,6 @@ CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libesedb.pc.in \
$(srcdir)/libesedb.spec.in $(top_srcdir)/dpkg/changelog.in \
$(top_srcdir)/dpkg/copyright.in \
$(top_srcdir)/include/libesedb/definitions.h.in \
$(top_srcdir)/include/libesedb/features.h.in \
$(top_srcdir)/include/libesedb/types.h.in ABOUT-NLS AUTHORS \
......@@ -364,6 +363,7 @@ LIBCSPLIT_CPPFLAGS = @LIBCSPLIT_CPPFLAGS@
LIBCSPLIT_LIBADD = @LIBCSPLIT_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBESEDB_DLL_EXPORT = @LIBESEDB_DLL_EXPORT@
LIBESEDB_DLL_IMPORT = @LIBESEDB_DLL_IMPORT@
LIBFCACHE_CPPFLAGS = @LIBFCACHE_CPPFLAGS@
LIBFCACHE_LIBADD = @LIBFCACHE_LIBADD@
......@@ -422,7 +422,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
PTHREAD_CPPFLAGS = @PTHREAD_CPPFLAGS@
PTHREAD_LIBADD = @PTHREAD_LIBADD@
PWD = @PWD@
PYTHON = @PYTHON@
PYTHON2 = @PYTHON2@
PYTHON2_CONFIG = @PYTHON2_CONFIG@
......@@ -572,7 +571,6 @@ libcsplit_LIBS = @libcsplit_LIBS@
libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libesedb_spec_build_requires = @libesedb_spec_build_requires@
libesedb_spec_requires = @libesedb_spec_requires@
libesedb_spec_tools_build_requires = @libesedb_spec_tools_build_requires@
libexecdir = @libexecdir@
......@@ -655,13 +653,12 @@ DPKG_FILES = \
dpkg/compat \
dpkg/control \
dpkg/copyright \
dpkg/copyright.in \
dpkg/rules \
dpkg/libesedb.docs \
dpkg/libesedb-dev.docs \
dpkg/libesedb-python.docs \
dpkg/libesedb-python3.docs \
dpkg/libesedb-tools.docs \
dpkg/libesedb.install \
dpkg/libesedb-dev.install \
dpkg/libesedb-python.install \
dpkg/libesedb-python3.install \
dpkg/libesedb-tools.install \
dpkg/source/format
GETTEXT_FILES = \
......@@ -716,8 +713,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -736,8 +733,6 @@ include/libesedb/types.h: $(top_builddir)/config.status $(top_srcdir)/include/li
cd $(top_builddir) && $(SHELL) ./config.status $@
dpkg/changelog: $(top_builddir)/config.status $(top_srcdir)/dpkg/changelog.in
cd $(top_builddir) && $(SHELL) ./config.status $@
dpkg/copyright: $(top_builddir)/config.status $(top_srcdir)/dpkg/copyright.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libesedb.pc: $(top_builddir)/config.status $(srcdir)/libesedb.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libesedb.spec: $(top_builddir)/config.status $(srcdir)/libesedb.spec.in
......@@ -879,7 +874,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......@@ -944,7 +942,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -970,7 +968,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -988,7 +986,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -998,7 +996,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
dnl Checks for required headers and functions
dnl
dnl Version: 20170913
dnl Function to detect if libesedb dependencies are available
AC_DEFUN([AX_LIBESEDB_CHECK_LOCAL],
[dnl Check for internationalization functions in libesedb/libesedb_i18n.c
......@@ -39,6 +43,16 @@ AC_DEFUN([AX_ESEDBTOOLS_CHECK_LOCAL],
[1])
])
dnl Headers included in esedbtools/log_handle.c
AC_CHECK_HEADERS([stdarg.h varargs.h])
AS_IF(
[test "x$ac_cv_header_stdarg_h" != xyes && test "x$ac_cv_header_varargs_h" != xyes],
[AC_MSG_FAILURE(
[Missing headers: stdarg.h and varargs.h],
[1])
])
dnl Check if tools should be build as static executables
AX_COMMON_CHECK_ENABLE_STATIC_EXECUTABLES
......
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -265,6 +265,7 @@ LIBCSPLIT_CPPFLAGS = @LIBCSPLIT_CPPFLAGS@
LIBCSPLIT_LIBADD = @LIBCSPLIT_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBESEDB_DLL_EXPORT = @LIBESEDB_DLL_EXPORT@
LIBESEDB_DLL_IMPORT = @LIBESEDB_DLL_IMPORT@
LIBFCACHE_CPPFLAGS = @LIBFCACHE_CPPFLAGS@
LIBFCACHE_LIBADD = @LIBFCACHE_LIBADD@
......@@ -323,7 +324,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
PTHREAD_CPPFLAGS = @PTHREAD_CPPFLAGS@
PTHREAD_LIBADD = @PTHREAD_LIBADD@
PWD = @PWD@
PYTHON = @PYTHON@
PYTHON2 = @PYTHON2@
PYTHON2_CONFIG = @PYTHON2_CONFIG@
......@@ -473,7 +473,6 @@ libcsplit_LIBS = @libcsplit_LIBS@
libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libesedb_spec_build_requires = @libesedb_spec_build_requires@
libesedb_spec_requires = @libesedb_spec_requires@
libesedb_spec_tools_build_requires = @libesedb_spec_tools_build_requires@
libexecdir = @libexecdir@
......@@ -558,8 +557,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -646,7 +645,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......
/*
* Byte stream functions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Common include file
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
......@@ -19,6 +19,9 @@
/* Define to 1 if you have the `chdir' function. */
#define HAVE_CHDIR 1
/* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the `close' function. */
#define HAVE_CLOSE 1
......@@ -331,6 +334,9 @@
/* Define to 1 if you have the mkdir function with a second mode argument. */
#define HAVE_MKDIR_MODE 1
/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
/* Define to 1 if multi thread support should be used. */
#define HAVE_MULTI_THREAD_SUPPORT 1
......@@ -355,15 +361,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H 1
/* Define to 1 if you have Python */
/* #undef HAVE_PYTHON */
/* Define to 1 if you have Python 2 */
/* #undef HAVE_PYTHON2 */
/* Define to 1 if you have Python 3 */
/* #undef HAVE_PYTHON3 */
/* Define to 1 if you have the <Python.h> header file. */
/* #undef HAVE_PYTHON_H */
......@@ -560,7 +557,7 @@
#define PACKAGE_NAME "libesedb"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libesedb 20170121"
#define PACKAGE_STRING "libesedb 20181229"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libesedb"
......@@ -569,11 +566,14 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "20170121"
#define PACKAGE_VERSION "20181229"
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 8
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
......@@ -596,7 +596,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "20170121"
#define VERSION "20181229"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
......
......@@ -18,6 +18,9 @@
/* Define to 1 if you have the `chdir' function. */
#undef HAVE_CHDIR
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
/* Define to 1 if you have the `close' function. */
#undef HAVE_CLOSE
......@@ -330,6 +333,9 @@
/* Define to 1 if you have the mkdir function with a second mode argument. */
#undef HAVE_MKDIR_MODE
/* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define to 1 if multi thread support should be used. */
#undef HAVE_MULTI_THREAD_SUPPORT
......@@ -354,15 +360,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
/* Define to 1 if you have Python */
#undef HAVE_PYTHON
/* Define to 1 if you have Python 2 */
#undef HAVE_PYTHON2
/* Define to 1 if you have Python 3 */
#undef HAVE_PYTHON3
/* Define to 1 if you have the <Python.h> header file. */
#undef HAVE_PYTHON_H
......@@ -573,6 +570,9 @@
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
......
/*
* Configuration for the Borland/CodeGear C++ Builder compiler
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Configuration for the Microsoft Visual Studio C++ compiler
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Configuration file for WINAPI
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* FILE stream functions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Memory functions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......@@ -88,7 +88,7 @@ extern "C" {
#elif defined( WINAPI )
#define memory_free( buffer ) \
HeapFree( GetProcessHeap(), 0, (LPVOID) buffer )
( buffer == NULL ) ? TRUE : HeapFree( GetProcessHeap(), 0, (LPVOID) buffer )
#elif defined( HAVE_FREE )
#define memory_free( buffer ) \
......
/*
* Narrow character string functions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* System character string functions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......@@ -83,11 +83,11 @@ extern "C" {
#endif
#if defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x0560 )
#define system_string_vsprintf \
#define system_string_vsnprintf \
wide_string_vsnwprintf
#else
#define system_string_vsprintf( string, size, format, ... ) \
#define system_string_vsnprintf( string, size, format, ... ) \
wide_string_vsnwprintf( string, size, format, __VA_ARGS__ )
#endif
......@@ -133,16 +133,19 @@ extern "C" {
#endif
#if defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x0560 )
#define system_string_vsprintf \
#define system_string_vsnprintf \
narrow_string_vsnprintf
#else
#define system_string_vsprintf( string, size, format, ... ) \
#define system_string_vsnprintf( string, size, format, ... ) \
narrow_string_vsnprintf( string, size, format, __VA_ARGS__ )
#endif
#endif /* defined( HAVE_WIDE_SYSTEM_CHARACTER ) */
/* For backwards compatibility */
#define system_string_vsprintf system_string_vsnprintf
#if defined( _cplusplus )
}
#endif
......
/*
* Type and type-support defintions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......@@ -59,7 +59,7 @@ typedef int system_integer_t;
#endif /* defined( WINAPI ) && ( defined( _UNICODE ) || defined( UNICODE ) ) */
/* Fix for systems without PRI definitions
/* Fallback for systems without PRI definitions
*/
#if !defined( PRId8 )
#define PRId8 "d"
......@@ -77,7 +77,7 @@ typedef int system_integer_t;
#define PRId32 "d"
#endif
#endif
#endif /* !defined( PRId32 ) */
#if !defined( PRId64 )
#if defined( WINAPI )
......@@ -90,7 +90,7 @@ typedef int system_integer_t;
#define PRId64 "lld"
#endif
#endif
#endif /* !defined( PRId64 ) */
#if !defined( PRIi8 )
#define PRIi8 "i"
......@@ -108,7 +108,7 @@ typedef int system_integer_t;
#define PRIi32 "i"
#endif
#endif
#endif /* !defined( PRIi32 ) */
#if !defined( PRIi64 )
#if defined( WINAPI )
......@@ -121,7 +121,7 @@ typedef int system_integer_t;
#define PRIi64 "lli"
#endif
#endif
#endif /* !defined( PRIi64 ) */
#if !defined( PRIu8 )
#define PRIu8 "u"
......@@ -139,7 +139,7 @@ typedef int system_integer_t;
#define PRIu32 "u"
#endif
#endif
#endif /* !defined( PRIu32 ) */
#if !defined( PRIu64 )
#if defined( WINAPI )
......@@ -152,7 +152,38 @@ typedef int system_integer_t;
#define PRIu64 "llu"
#endif
#endif /* !defined( PRIu64 ) */
#if !defined( PRIo8 )
#define PRIo8 "o"
#endif
#if !defined( PRIo16 )
#define PRIo16 "o"
#endif
#if !defined( PRIo32 )
#if defined( WINAPI )
#define PRIo32 "I32o"
#else
#define PRIo32 "o"
#endif
#endif /* !defined( PRIo32 ) */
#if !defined( PRIo64 )
#if defined( WINAPI )
#define PRIo64 "I64o"
#elif __WORDSIZE == 64
#define PRIo64 "lo"
#else
#define PRIo64 "llo"
#endif
#endif /* !defined( PRIo64 ) */
#if !defined( PRIx8 )
#define PRIx8 "x"
......@@ -170,7 +201,7 @@ typedef int system_integer_t;
#define PRIx32 "x"
#endif
#endif
#endif /* !defined( PRIx32 ) */
#if !defined( PRIx64 )
#if defined( WINAPI )
......@@ -183,9 +214,9 @@ typedef int system_integer_t;
#define PRIx64 "llx"
#endif
#endif
#endif /*!defined( PRIx64 ) */
/* Fix for systems without printf %jd definition
/* Fallback for systems without printf %jd definition
*/
#if defined( HAVE_PRINTF_JD )
#define PRIjd "jd"
......@@ -205,9 +236,9 @@ typedef int system_integer_t;
#define PRIju PRIu32
#define PRIjx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_JD ) */
/* Fix for systems without printf %zd definition
/* Fallback for systems without printf %zd definition
*/
#if defined( HAVE_PRINTF_ZD )
#define PRIzd "zd"
......@@ -215,7 +246,7 @@ typedef int system_integer_t;
#define PRIzu "zu"
#define PRIzx "zx"
#elif defined( WINAPI )
#elif defined( _MSC_VER )
#define PRIzd "Id"
#define PRIzi "Ii"
#define PRIzu "Iu"
......@@ -233,9 +264,9 @@ typedef int system_integer_t;
#define PRIzu PRIu32
#define PRIzx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_ZD ) */
/* Fix for systems without (U)INTx_MAX definitions
/* Fallback for systems without (U)INTx_MAX definitions
*/
/* The maximum signed 8-bit integer is 127 (0x7f)
......@@ -250,7 +281,7 @@ typedef int system_integer_t;
#define UINT8_MAX (0xff)
#endif
/* The maximum signed 16-bit integer is 32767 (0xr7ffff)
/* The maximum signed 16-bit integer is 32767 (0x7ffff)
*/
#if !defined( INT16_MAX )
#define INT16_MAX (0x7fff)
......@@ -282,7 +313,7 @@ typedef int system_integer_t;
#else
#define INT64_MAX (0x7fffffffffffffffULL)
#endif
#endif
#endif /* !defined( INT64_MAX ) */
/* The maximum unsigned 64-bit integer is 18446744073709551615 (0xffffffffffffffff)
*/
......@@ -292,7 +323,7 @@ typedef int system_integer_t;
#else
#define UINT64_MAX (0xffffffffffffffffULL)
#endif
#endif
#endif /* !defined( UINT64_MAX ) */
/* The maximum signed integer
*/
......@@ -306,6 +337,18 @@ typedef int system_integer_t;
#define UINT_MAX UINT32_MAX
#endif
/* The maximum signed long integer
*/
#if !defined( LONG_MAX )
#define LONG_MAX INT32_MAX
#endif
/* The maximum unsigned long integer
*/
#if !defined( ULONG_MAX )
#define ULONG_MAX UINT32_MAX
#endif
/* The maximum signed size type is platform dependent
*/
#if !defined( SSIZE_MAX )
......@@ -316,7 +359,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* _WIN64 */
#endif
#else
......@@ -324,7 +367,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* __WORDSIZE == 64 */
#endif
#endif /* WINAPI */
......
/*
* Type and type-support defintions
*
* Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2009-2018, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......@@ -59,7 +59,7 @@ typedef int system_integer_t;
#endif /* defined( WINAPI ) && ( defined( _UNICODE ) || defined( UNICODE ) ) */
/* Fix for systems without PRI definitions
/* Fallback for systems without PRI definitions
*/
#if !defined( PRId8 )
#define PRId8 "d"
......@@ -77,7 +77,7 @@ typedef int system_integer_t;
#define PRId32 "d"
#endif
#endif
#endif /* !defined( PRId32 ) */
#if !defined( PRId64 )
#if defined( WINAPI )