[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36268 - in libmicrohttpd: src/microhttpd w32/VS2013
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36268 - in libmicrohttpd: src/microhttpd w32/VS2013 |
|
Date: |
Sat, 22 Aug 2015 17:45:36 +0200 |
Author: Karlson2k
Date: 2015-08-22 17:45:36 +0200 (Sat, 22 Aug 2015)
New Revision: 36268
Added:
libmicrohttpd/src/microhttpd/mhd_byteorder.h
libmicrohttpd/src/microhttpd/mhd_limits.h
Removed:
libmicrohttpd/src/microhttpd/MHD_byteorder.h
libmicrohttpd/src/microhttpd/MHD_limits.h
Modified:
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/src/microhttpd/md5.c
libmicrohttpd/src/microhttpd/response.c
libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters
Log:
fix file names, include missing files to Makefile
Deleted: libmicrohttpd/src/microhttpd/MHD_byteorder.h
===================================================================
--- libmicrohttpd/src/microhttpd/MHD_byteorder.h 2015-08-22 06:24:03 UTC
(rev 36267)
+++ libmicrohttpd/src/microhttpd/MHD_byteorder.h 2015-08-22 15:45:36 UTC
(rev 36268)
@@ -1,160 +0,0 @@
-/*
- This file is part of libmicrohttpd
- Copyright (C) 2015 Karlson2k (Evgeny Grin)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library.
- If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file microhttpd/MHD_byteorder.h
- * @brief macro definitions for host byte order
- * @author Karlson2k (Evgeny Grin)
- */
-
-#ifndef MHD_BYTEORDER_H
-#define MHD_BYTEORDER_H
-
-#include "platform.h"
-
-#if HAVE_ENDIAN_H
-#include <endian.h>
-#endif
-
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#if HAVE_MACHINE_ENDIAN_H
-#include <machine/endian.h>
-#endif
-
-#if HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#endif
-
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if HAVE_SYS_BYTEORDER_H
-#include <sys/byteorder.h>
-#endif
-
-#if HAVE_SYS_MACHINE_H
-#include <sys/machine.h>
-#endif
-
-#if HAVE_MACHINE_PARAM_H
-#include <machine/param.h>
-#endif
-
-#if HAVE_SYS_ISA_DEFS_H
-#include <sys/isa_defs.h>
-#endif
-
-#define _MHD_BIG_ENDIAN 1234
-#define _MHD_LITTLE_ENDIAN 4321
-#define _MHD_PDP_ENDIAN 2143
-
-#if defined(__BYTE_ORDER__)
-#if defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ ==
__ORDER_LITTLE_ENDIAN__
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__ORDER_PDP_ENDIAN__) && __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__
-#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
-#endif /* __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__ */
-#elif defined(__BYTE_ORDER)
-#if defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__PDP_ENDIAN) && __BYTE_ORDER == __PDP_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
-#endif /* __BYTE_ORDER == __PDP_ENDIAN */
-#elif defined (BYTE_ORDER)
-#if defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(LITTLE_ENDIAN) && BYTE_ORDER == LITTLE_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(PDP_ENDIAN) && BYTE_ORDER == PDP_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
-#endif /* __BYTE_ORDER == _PDP_ENDIAN */
-#elif defined (_BYTE_ORDER)
-#if defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(_PDP_ENDIAN) && _BYTE_ORDER == _PDP_ENDIAN
-#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
-#endif /* _BYTE_ORDER == _PDP_ENDIAN */
-#endif /* _BYTE_ORDER */
-
-#ifndef _MHD_BYTE_ORDER
-/* Byte order specification didn't detected in system headers */
-/* Try some guessing */
-
-#if (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \
- (defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN))
-/* Seems that we are on big endian platform */
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif (defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \
- (defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN))
-/* Seems that we are on little endian platform */
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__) ||
defined(__x86_64) || \
- defined(_M_X64) || defined(_M_AMD64) || defined(i386) || defined(__i386)
|| \
- defined(__i386__) || defined(__i486__) || defined(__i586__) ||
defined(__i686__) || \
- defined(_M_IX86) || defined(_X86_) || defined (__THW_INTEL__)
-/* x86 family is little endian */
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) ||
\
- defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)
-/* Looks like we are on ARM/MIPS in big endian mode */
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || \
- defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__)
-/* Looks like we are on ARM/MIPS in little endian mode */
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__m68k__) || defined(M68000) || defined(__hppa__) ||
defined(__hppa) || \
- defined(__HPPA__) || defined(__370__) || defined(__THW_370__) || \
- defined(__s390__) || defined(__s390x__) || defined(__SYSC_ZARCH__)
-/* Looks like we are on big endian platform */
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#elif defined(__ia64__) || defined(_IA64) || defined(__IA64__) ||
defined(__ia64) || \
- defined(_M_IA64) || defined(__itanium__) || defined(__bfin__) || \
- defined(__BFIN__) || defined(bfin) || defined(BFIN)
-/* Looks like we are on little endian platform */
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(_WIN32)
-/* W32 is always little endian on all platforms */
-#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(WORDS_BIGENDIAN)
-/* Use byte order detected by configure */
-#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
-#endif /* _WIN32 */
-
-#endif /* !_MHD_BYTE_ORDER */
-
-#ifdef _MHD_BYTE_ORDER
-/* Some safety checks */
-#if defined(WORDS_BIGENDIAN) && _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN
-#error Configure detected big endian byte order but headers specify different
byte order
-#elif !defined(WORDS_BIGENDIAN) && _MHD_BYTE_ORDER == _MHD_BIG_ENDIAN
-#error Configure did not detect big endian byte order but headers specify big
endian byte order
-#endif /* !WORDS_BIGENDIAN && _MHD_BYTE_ORDER == _MHD_BIG_ENDIAN */
-#endif /* _MHD_BYTE_ORDER */
-
-#endif /* !MHD_BYTEORDER_H */
Deleted: libmicrohttpd/src/microhttpd/MHD_limits.h
===================================================================
--- libmicrohttpd/src/microhttpd/MHD_limits.h 2015-08-22 06:24:03 UTC (rev
36267)
+++ libmicrohttpd/src/microhttpd/MHD_limits.h 2015-08-22 15:45:36 UTC (rev
36268)
@@ -1,73 +0,0 @@
-/*
- This file is part of libmicrohttpd
- Copyright (C) 2015 Karlson2k (Evgeny Grin)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-*/
-
-/**
- * @file microhttpd/MHD_limits.h
- * @brief limits values definitions
- * @author Karlson2k (Evgeny Grin)
- */
-
-#ifndef MHD_LIMITS_H
-#define MHD_LIMITS_H
-
-#include "platform.h"
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif /* HAVE_LIMITS_H */
-
-#ifndef LONG_MAX
-#define LONG_MAX ((long) ~(((uint64_t) 1) << (8 * sizeof(long) - 1)))
-#endif /* !OFF_T_MAX */
-
-#ifndef ULLONG_MAX
-#define ((MHD_UNSIGNED_LONG_LONG) ~((MHD_UNSIGNED_LONG_LONG)0))
-#endif /* !ULLONG_MAX */
-
-#ifndef INT32_MAX
-#define INT32_MAX ((int32_t)0x7FFFFFFF)
-#endif /* !INT32_MAX */
-
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t) ~((size_t)0))
-#endif /* !SIZE_MAX */
-
-#ifndef OFF_T_MAX
-#define OFF_T_MAX ((off_t) ~(((uint64_t) 1) << (8 * sizeof(off_t) - 1)))
-#endif /* !OFF_T_MAX */
-
-#if defined(_LARGEFILE64_SOURCE) && !defined(OFF64_T_MAX)
-#define OFF64_T_MAX ((off64_t) ~(((uint64_t) 1) << (8 * sizeof(off64_t) - 1)))
-#endif /* _LARGEFILE64_SOURCE && !OFF64_T_MAX */
-
-#ifndef TIME_T_MAX
-/* Assume that time_t is signed type. */
-/* Even if time_t is unsigned, TIME_T_MAX will be safe limit */
-#define TIME_T_MAX ( (time_t) ~(((uint64_t) 1) << (8 * sizeof(time_t) - 1)) )
-#endif /* !TIME_T_MAX */
-
-#ifndef TIMEVAL_TV_SEC_MAX
-#ifndef _WIN32
-#define TIMEVAL_TV_SEC_MAX TIME_T_MAX
-#else /* _WIN32 */
-#define TIMEVAL_TV_SEC_MAX LONG_MAX
-#endif /* _WIN32 */
-#endif /* !TIMEVAL_TV_SEC_MAX */
-
-#endif /* MHD_LIMITS_H */
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2015-08-22 06:24:03 UTC (rev
36267)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2015-08-22 15:45:36 UTC (rev
36268)
@@ -62,6 +62,7 @@
daemon.c \
internal.c internal.h \
memorypool.c memorypool.h \
+ mhd_limits.h mhd_byteorder.h \
response.c response.h
libmicrohttpd_la_CPPFLAGS = \
$(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2015-08-22 06:24:03 UTC (rev
36267)
+++ libmicrohttpd/src/microhttpd/daemon.c 2015-08-22 15:45:36 UTC (rev
36268)
@@ -36,7 +36,7 @@
#include "response.h"
#include "connection.h"
#include "memorypool.h"
-#include "MHD_limits.h"
+#include "mhd_limits.h"
#include "autoinit_funcs.h"
#if HAVE_SEARCH_H
Modified: libmicrohttpd/src/microhttpd/md5.c
===================================================================
--- libmicrohttpd/src/microhttpd/md5.c 2015-08-22 06:24:03 UTC (rev 36267)
+++ libmicrohttpd/src/microhttpd/md5.c 2015-08-22 15:45:36 UTC (rev 36268)
@@ -18,7 +18,7 @@
/* Based on OpenBSD modifications */
#include "md5.h"
-#include "MHD_byteorder.h"
+#include "mhd_byteorder.h"
#define PUT_64BIT_LE(cp, value) do { \
(cp)[7] = (uint8_t)((value) >> 56); \
Copied: libmicrohttpd/src/microhttpd/mhd_byteorder.h (from rev 36244,
libmicrohttpd/src/microhttpd/MHD_byteorder.h)
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_byteorder.h
(rev 0)
+++ libmicrohttpd/src/microhttpd/mhd_byteorder.h 2015-08-22 15:45:36 UTC
(rev 36268)
@@ -0,0 +1,160 @@
+/*
+ This file is part of libmicrohttpd
+ Copyright (C) 2015 Karlson2k (Evgeny Grin)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.
+ If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file microhttpd/mhd_byteorder.h
+ * @brief macro definitions for host byte order
+ * @author Karlson2k (Evgeny Grin)
+ */
+
+#ifndef MHD_BYTEORDER_H
+#define MHD_BYTEORDER_H
+
+#include "platform.h"
+
+#if HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#if HAVE_MACHINE_ENDIAN_H
+#include <machine/endian.h>
+#endif
+
+#if HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if HAVE_SYS_BYTEORDER_H
+#include <sys/byteorder.h>
+#endif
+
+#if HAVE_SYS_MACHINE_H
+#include <sys/machine.h>
+#endif
+
+#if HAVE_MACHINE_PARAM_H
+#include <machine/param.h>
+#endif
+
+#if HAVE_SYS_ISA_DEFS_H
+#include <sys/isa_defs.h>
+#endif
+
+#define _MHD_BIG_ENDIAN 1234
+#define _MHD_LITTLE_ENDIAN 4321
+#define _MHD_PDP_ENDIAN 2143
+
+#if defined(__BYTE_ORDER__)
+#if defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ ==
__ORDER_LITTLE_ENDIAN__
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(__ORDER_PDP_ENDIAN__) && __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__
+#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
+#endif /* __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__ */
+#elif defined(__BYTE_ORDER)
+#if defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(__PDP_ENDIAN) && __BYTE_ORDER == __PDP_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
+#endif /* __BYTE_ORDER == __PDP_ENDIAN */
+#elif defined (BYTE_ORDER)
+#if defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(LITTLE_ENDIAN) && BYTE_ORDER == LITTLE_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(PDP_ENDIAN) && BYTE_ORDER == PDP_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
+#endif /* __BYTE_ORDER == _PDP_ENDIAN */
+#elif defined (_BYTE_ORDER)
+#if defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(_PDP_ENDIAN) && _BYTE_ORDER == _PDP_ENDIAN
+#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
+#endif /* _BYTE_ORDER == _PDP_ENDIAN */
+#endif /* _BYTE_ORDER */
+
+#ifndef _MHD_BYTE_ORDER
+/* Byte order specification didn't detected in system headers */
+/* Try some guessing */
+
+#if (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \
+ (defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN))
+/* Seems that we are on big endian platform */
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif (defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \
+ (defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN))
+/* Seems that we are on little endian platform */
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__) ||
defined(__x86_64) || \
+ defined(_M_X64) || defined(_M_AMD64) || defined(i386) || defined(__i386)
|| \
+ defined(__i386__) || defined(__i486__) || defined(__i586__) ||
defined(__i686__) || \
+ defined(_M_IX86) || defined(_X86_) || defined (__THW_INTEL__)
+/* x86 family is little endian */
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) ||
\
+ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)
+/* Looks like we are on ARM/MIPS in big endian mode */
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || \
+ defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__)
+/* Looks like we are on ARM/MIPS in little endian mode */
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(__m68k__) || defined(M68000) || defined(__hppa__) ||
defined(__hppa) || \
+ defined(__HPPA__) || defined(__370__) || defined(__THW_370__) || \
+ defined(__s390__) || defined(__s390x__) || defined(__SYSC_ZARCH__)
+/* Looks like we are on big endian platform */
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#elif defined(__ia64__) || defined(_IA64) || defined(__IA64__) ||
defined(__ia64) || \
+ defined(_M_IA64) || defined(__itanium__) || defined(__bfin__) || \
+ defined(__BFIN__) || defined(bfin) || defined(BFIN)
+/* Looks like we are on little endian platform */
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(_WIN32)
+/* W32 is always little endian on all platforms */
+#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
+#elif defined(WORDS_BIGENDIAN)
+/* Use byte order detected by configure */
+#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
+#endif /* _WIN32 */
+
+#endif /* !_MHD_BYTE_ORDER */
+
+#ifdef _MHD_BYTE_ORDER
+/* Some safety checks */
+#if defined(WORDS_BIGENDIAN) && _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN
+#error Configure detected big endian byte order but headers specify different
byte order
+#elif !defined(WORDS_BIGENDIAN) && _MHD_BYTE_ORDER == _MHD_BIG_ENDIAN
+#error Configure did not detect big endian byte order but headers specify big
endian byte order
+#endif /* !WORDS_BIGENDIAN && _MHD_BYTE_ORDER == _MHD_BIG_ENDIAN */
+#endif /* _MHD_BYTE_ORDER */
+
+#endif /* !MHD_BYTEORDER_H */
Copied: libmicrohttpd/src/microhttpd/mhd_limits.h (from rev 36244,
libmicrohttpd/src/microhttpd/MHD_limits.h)
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_limits.h (rev 0)
+++ libmicrohttpd/src/microhttpd/mhd_limits.h 2015-08-22 15:45:36 UTC (rev
36268)
@@ -0,0 +1,73 @@
+/*
+ This file is part of libmicrohttpd
+ Copyright (C) 2015 Karlson2k (Evgeny Grin)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+*/
+
+/**
+ * @file microhttpd/mhd_limits.h
+ * @brief limits values definitions
+ * @author Karlson2k (Evgeny Grin)
+ */
+
+#ifndef MHD_LIMITS_H
+#define MHD_LIMITS_H
+
+#include "platform.h"
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif /* HAVE_LIMITS_H */
+
+#ifndef LONG_MAX
+#define LONG_MAX ((long) ~(((uint64_t) 1) << (8 * sizeof(long) - 1)))
+#endif /* !OFF_T_MAX */
+
+#ifndef ULLONG_MAX
+#define ((MHD_UNSIGNED_LONG_LONG) ~((MHD_UNSIGNED_LONG_LONG)0))
+#endif /* !ULLONG_MAX */
+
+#ifndef INT32_MAX
+#define INT32_MAX ((int32_t)0x7FFFFFFF)
+#endif /* !INT32_MAX */
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) ~((size_t)0))
+#endif /* !SIZE_MAX */
+
+#ifndef OFF_T_MAX
+#define OFF_T_MAX ((off_t) ~(((uint64_t) 1) << (8 * sizeof(off_t) - 1)))
+#endif /* !OFF_T_MAX */
+
+#if defined(_LARGEFILE64_SOURCE) && !defined(OFF64_T_MAX)
+#define OFF64_T_MAX ((off64_t) ~(((uint64_t) 1) << (8 * sizeof(off64_t) - 1)))
+#endif /* _LARGEFILE64_SOURCE && !OFF64_T_MAX */
+
+#ifndef TIME_T_MAX
+/* Assume that time_t is signed type. */
+/* Even if time_t is unsigned, TIME_T_MAX will be safe limit */
+#define TIME_T_MAX ( (time_t) ~(((uint64_t) 1) << (8 * sizeof(time_t) - 1)) )
+#endif /* !TIME_T_MAX */
+
+#ifndef TIMEVAL_TV_SEC_MAX
+#ifndef _WIN32
+#define TIMEVAL_TV_SEC_MAX TIME_T_MAX
+#else /* _WIN32 */
+#define TIMEVAL_TV_SEC_MAX LONG_MAX
+#endif /* _WIN32 */
+#endif /* !TIMEVAL_TV_SEC_MAX */
+
+#endif /* MHD_LIMITS_H */
Modified: libmicrohttpd/src/microhttpd/response.c
===================================================================
--- libmicrohttpd/src/microhttpd/response.c 2015-08-22 06:24:03 UTC (rev
36267)
+++ libmicrohttpd/src/microhttpd/response.c 2015-08-22 15:45:36 UTC (rev
36268)
@@ -28,7 +28,7 @@
#include "internal.h"
#include "response.h"
-#include "MHD_limits.h"
+#include "mhd_limits.h"
#if defined(_WIN32) && defined(MHD_W32_MUTEX_)
#ifndef WIN32_LEAN_AND_MEAN
Modified: libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
===================================================================
--- libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj 2015-08-22 06:24:03 UTC
(rev 36267)
+++ libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj 2015-08-22 15:45:36 UTC
(rev 36268)
@@ -92,8 +92,8 @@
<ClInclude Include="..\..\src\microhttpd\internal.h" />
<ClInclude Include="..\..\src\microhttpd\md5.h" />
<ClInclude Include="..\..\src\microhttpd\memorypool.h" />
- <ClInclude Include="..\..\src\microhttpd\MHD_byteorder.h" />
- <ClInclude Include="..\..\src\microhttpd\MHD_limits.h" />
+ <ClInclude Include="..\..\src\microhttpd\mhd_byteorder.h" />
+ <ClInclude Include="..\..\src\microhttpd\mhd_limits.h" />
<ClInclude Include="..\..\src\microhttpd\reason_phrase.h" />
<ClInclude Include="..\..\src\microhttpd\response.h" />
<ClInclude Include="..\..\src\microhttpd\tsearch.h" />
Modified: libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters
===================================================================
--- libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters 2015-08-22
06:24:03 UTC (rev 36267)
+++ libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters 2015-08-22
15:45:36 UTC (rev 36268)
@@ -105,10 +105,10 @@
<ClInclude Include="..\..\src\include\autoinit_funcs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\microhttpd\MHD_limits.h">
+ <ClInclude Include="..\..\src\microhttpd\mhd_limits.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\microhttpd\MHD_byteorder.h">
+ <ClInclude Include="..\..\src\microhttpd\mhd_byteorder.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36268 - in libmicrohttpd: src/microhttpd w32/VS2013,
gnunet <=