mirror of https://gitee.com/bigwinds/arangodb
cleanup
This commit is contained in:
parent
8d9ffbb42f
commit
680adfdc21
|
@ -1,42 +0,0 @@
|
|||
diff -bru libev-4.22.orig/ev.c libev-4.22/ev.c
|
||||
--- libev-4.22.orig/ev.c 2015-12-20 22:12:53.000000000 +0100
|
||||
+++ libev-4.22/ev.c 2016-02-24 18:35:42.000000000 +0100
|
||||
@@ -480,7 +480,7 @@
|
||||
* This value is good at least till the year 4000.
|
||||
*/
|
||||
#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
|
||||
-/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
|
||||
+/*#define MIN_INTERVAL 0.00000095367431640625 / * 1/2**20, good till 2200 */
|
||||
|
||||
#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
|
||||
#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
|
||||
@@ -1822,7 +1822,11 @@
|
||||
#include "ev_wrap.h"
|
||||
|
||||
static struct ev_loop default_loop_struct;
|
||||
+#ifdef EV_API_STATIC
|
||||
EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
|
||||
+#else
|
||||
+ struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
|
||||
+#endif
|
||||
|
||||
#else
|
||||
|
||||
@@ -1942,7 +1946,7 @@
|
||||
return ncur;
|
||||
}
|
||||
|
||||
-static void * noinline ecb_cold
|
||||
+static noinline void * ecb_cold
|
||||
array_realloc (int elem, void *base, int *cur, int cnt)
|
||||
{
|
||||
*cur = array_nextsize (elem, *cur, cnt);
|
||||
@@ -3845,7 +3849,7 @@
|
||||
/* common bug, apparently */
|
||||
assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
|
||||
|
||||
- fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
|
||||
+ fd_change (EV_A_ fd, (w->events & EV__IOFDSET) | EV_ANFD_REIFY);
|
||||
w->events &= ~EV__IOFDSET;
|
||||
|
||||
EV_FREQUENT_CHECK;
|
|
@ -1,80 +0,0 @@
|
|||
diff -ru zlib-1.2.8-orig/CMakeLists.txt zlib-1.2.8/CMakeLists.txt
|
||||
--- zlib-1.2.8-orig/CMakeLists.txt 2013-04-29 00:57:10.000000000 +0200
|
||||
+++ zlib-1.2.8/CMakeLists.txt 2016-02-29 17:20:22.000000000 +0100
|
||||
@@ -1,8 +1,17 @@
|
||||
cmake_minimum_required(VERSION 2.4.4)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
||||
|
||||
+if (POLICY CMP0042)
|
||||
+ cmake_policy(SET CMP0042 OLD)
|
||||
+endif ()
|
||||
+
|
||||
+if (POLICY CMP0048)
|
||||
+ cmake_policy(SET CMP0048 NEW)
|
||||
+endif ()
|
||||
+
|
||||
project(zlib C)
|
||||
|
||||
+set(zlib_VERSION 1.2.8)
|
||||
set(VERSION "1.2.8")
|
||||
|
||||
option(ASM686 "Enable building i686 assembly implementation")
|
||||
@@ -202,7 +211,7 @@
|
||||
if(UNIX)
|
||||
# On unix-like platforms the library is almost always called libz
|
||||
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
||||
- if(NOT APPLE)
|
||||
+ if(NOT APPLE AND NOT SOLARIS)
|
||||
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
|
||||
endif()
|
||||
elseif(BUILD_SHARED_LIBS AND WIN32)
|
||||
@@ -230,11 +239,13 @@
|
||||
# Example binaries
|
||||
#============================================================================
|
||||
|
||||
-add_executable(example test/example.c)
|
||||
+include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
|
||||
+
|
||||
+add_executable(example EXCLUDE_FROM_ALL test/example.c)
|
||||
target_link_libraries(example zlib)
|
||||
add_test(example example)
|
||||
|
||||
-add_executable(minigzip test/minigzip.c)
|
||||
+add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
|
||||
target_link_libraries(minigzip zlib)
|
||||
|
||||
if(HAVE_OFF64_T)
|
||||
@@ -247,3 +258,33 @@
|
||||
target_link_libraries(minigzip64 zlib)
|
||||
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
||||
endif()
|
||||
+
|
||||
+set(ZLIB_VERSION
|
||||
+ ${zlib_VERSION}
|
||||
+ CACHE INTERNAL
|
||||
+ "${PROJECT_NAME}: Version"
|
||||
+ FORCE
|
||||
+)
|
||||
+
|
||||
+if (WINDOWS)
|
||||
+ set(ZLIB_LIBS
|
||||
+ ${zlib_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zlibstaticd.lib
|
||||
+ CACHE INTERNAL
|
||||
+ "${PROJECT_NAME}: Libraries"
|
||||
+ FORCE
|
||||
+ )
|
||||
+else ()
|
||||
+ set(ZLIB_LIBS
|
||||
+ ${zlib_BINARY_DIR}/libz.a
|
||||
+ CACHE INTERNAL
|
||||
+ "${PROJECT_NAME}: Libraries"
|
||||
+ FORCE
|
||||
+ )
|
||||
+endif ()
|
||||
+
|
||||
+set(ZLIB_INCLUDE_DIR
|
||||
+ ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
|
||||
+ CACHE INTERNAL
|
||||
+ "${PROJECT_NAME}: Include Directories"
|
||||
+ FORCE
|
||||
+)
|
Loading…
Reference in New Issue