diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-06-05 16:50:33 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-06-05 16:50:33 (GMT) |
| commit | f4eb0316ec83eaefd1300da4a6d4afb787148134 (patch) | |
| tree | 7bf3e911f3670b7ba8a69142925c7417a8b7804e | |
| parent | cc2d9c5379e6df9d0a3813615ca0b8187cdc32a4 (diff) | |
| download | mxe-f4eb0316ec83eaefd1300da4a6d4afb787148134.zip mxe-f4eb0316ec83eaefd1300da4a6d4afb787148134.tar.gz mxe-f4eb0316ec83eaefd1300da4a6d4afb787148134.tar.bz2 | |
hyperscan: update line numbers in the diff
I moved them to another commit to separate from major changes.
| -rw-r--r-- | src/hyperscan-1-fixes.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index f202776..e6954bb 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -41,7 +41,7 @@ index 1111111..2222222 100644 option(OPTIMISE "Turns off compiler optimizations (on by default unless debug output enabled or coverage testing)" TRUE) option(DEBUG_OUTPUT "Enable debug output (warning: very verbose)" FALSE) -@@ -362,12 +356,10 @@ set(RAGEL_C_FLAGS "-Wno-unused") +@@ -375,12 +369,10 @@ set(RAGEL_C_FLAGS "-Wno-unused") endif() set_source_files_properties( @@ -5941,7 +5941,7 @@ diff --git a/cmake/config.h.in b/cmake/config.h.in index 1111111..2222222 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in -@@ -99,3 +99,4 @@ +@@ -89,3 +89,4 @@ /* define if this is a release build. */ #cmakedefine RELEASE_BUILD @@ -6114,7 +6114,7 @@ index 1111111..2222222 100644 #include <cpuid.h> #endif -@@ -54,7 +54,7 @@ +@@ -60,7 +60,7 @@ static __inline void cpuid(unsigned int op, unsigned int leaf, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { @@ -6223,7 +6223,7 @@ diff --git a/unit/hyperscan/test_util.h b/unit/hyperscan/test_util.h index 1111111..2222222 100644 --- a/unit/hyperscan/test_util.h +++ b/unit/hyperscan/test_util.h -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ #include "hs.h" #ifndef UNUSED @@ -6283,7 +6283,7 @@ index 1111111..2222222 100644 message(FATAL_ERROR "Windows DLLs currently not supported") else() message(STATUS "Building shared libraries") -@@ -227,7 +227,7 @@ endif() +@@ -238,7 +238,7 @@ include (${CMAKE_MODULE_PATH}/arch.cmake) CHECK_C_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CC_BUILTIN_ASSUME_ALIGNED) CHECK_CXX_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CXX_BUILTIN_ASSUME_ALIGNED) @@ -6292,7 +6292,7 @@ index 1111111..2222222 100644 set(C_FLAGS_TO_CHECK # Variable length arrays are way bad, most especially at run time "-Wvla" -@@ -314,7 +314,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -325,7 +325,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(FREEBSD true) endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") @@ -6340,7 +6340,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -200,6 +200,11 @@ else() +@@ -208,6 +208,11 @@ else() endif() |