| Index: sdch/linux/config.h | 
| diff --git a/sdch/linux/config.h b/sdch/linux/config.h | 
| index 3232eae67eb1b256b6598aebd30c0d6c7a013e7d..6f540f7dbd07799b4083eed482b1b42ed05bc7f3 100644 | 
| --- a/sdch/linux/config.h | 
| +++ b/sdch/linux/config.h | 
| @@ -1,119 +1,53 @@ | 
| -/* src/config.h.  Generated from config.h.in by configure.  */ | 
| -/* src/config.h.in.  Generated from configure.ac by autoheader.  */ | 
| - | 
| -/* Define to 1 if you have the <dlfcn.h> header file. */ | 
| -#define HAVE_DLFCN_H 1 | 
| +// Copyright 2016 The open-vcdiff Authors. All Rights Reserved. | 
| +// | 
| +// Licensed under the Apache License, Version 2.0 (the "License"); | 
| +// you may not use this file except in compliance with the License. | 
| +// You may obtain a copy of the License at | 
| +// | 
| +//      http://www.apache.org/licenses/LICENSE-2.0 | 
| +// | 
| +// Unless required by applicable law or agreed to in writing, software | 
| +// distributed under the License is distributed on an "AS IS" BASIS, | 
| +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 
| +// See the License for the specific language governing permissions and | 
| +// limitations under the License. | 
| + | 
| +/* Defined to PROJECT_VERSION from CMakeLists.txt */ | 
| +#define OPEN_VCDIFF_VERSION "0.8.4" | 
|  | 
| /* Define to 1 if you have the <ext/rope> header file. */ | 
| /* #undef HAVE_EXT_ROPE */ | 
|  | 
| -/* Define to 1 if you have the <fnmatch.h> header file. */ | 
| -#define HAVE_FNMATCH_H 1 | 
| - | 
| -/* Define to 1 if you have the <getopt.h> header file. */ | 
| -#define HAVE_GETOPT_H 1 | 
| - | 
| /* Define to 1 if you have the `gettimeofday' function. */ | 
| -#define HAVE_GETTIMEOFDAY 1 | 
| - | 
| -/* Define to 1 if you have the <inttypes.h> header file. */ | 
| -#define HAVE_INTTYPES_H 1 | 
| +#define HAVE_GETTIMEOFDAY | 
|  | 
| /* Define to 1 if you have the <malloc.h> header file. */ | 
| -/* Manual edit: This is defined in AndroidConfig.h. */ | 
| -#undef HAVE_MALLOC_H | 
| -#define HAVE_MALLOC_H 1 | 
| +#define HAVE_MALLOC_H | 
|  | 
| /* Define to 1 if you have the `memalign' function. */ | 
| -#define HAVE_MEMALIGN 1 | 
| - | 
| -/* Define to 1 if you have the <memory.h> header file. */ | 
| -#define HAVE_MEMORY_H 1 | 
| +#define HAVE_MEMALIGN | 
|  | 
| /* Define to 1 if you have the `mprotect' function. */ | 
| -#define HAVE_MPROTECT 1 | 
| +#define HAVE_MPROTECT | 
|  | 
| /* Define to 1 if you have the `posix_memalign' function. */ | 
| -#define HAVE_POSIX_MEMALIGN 1 | 
| - | 
| -/* Define to 1 if you have the `QueryPerformanceCounter' function. */ | 
| -/* #undef HAVE_QUERYPERFORMANCECOUNTER */ | 
| - | 
| -/* Define to 1 if you have the <stdint.h> header file. */ | 
| -#define HAVE_STDINT_H 1 | 
| - | 
| -/* Define to 1 if you have the <stdlib.h> header file. */ | 
| -#define HAVE_STDLIB_H 1 | 
| - | 
| -/* Define to 1 if you have the <strings.h> header file. */ | 
| -#define HAVE_STRINGS_H 1 | 
| - | 
| -/* Define to 1 if you have the <string.h> header file. */ | 
| -#define HAVE_STRING_H 1 | 
| - | 
| -/* Define to 1 if you have the `strtoll' function. */ | 
| -#define HAVE_STRTOLL 1 | 
| - | 
| -/* Define to 1 if you have the `strtoq' function. */ | 
| -#define HAVE_STRTOQ 1 | 
| +#define HAVE_POSIX_MEMALIGN | 
|  | 
| /* Define to 1 if you have the <sys/mman.h> header file. */ | 
| -#define HAVE_SYS_MMAN_H 1 | 
| +#define HAVE_SYS_MMAN_H | 
|  | 
| /* Define to 1 if you have the <sys/stat.h> header file. */ | 
| -#define HAVE_SYS_STAT_H 1 | 
| +#define HAVE_SYS_STAT_H | 
|  | 
| /* Define to 1 if you have the <sys/time.h> header file. */ | 
| -#define HAVE_SYS_TIME_H 1 | 
| - | 
| -/* Define to 1 if you have the <sys/types.h> header file. */ | 
| -#define HAVE_SYS_TYPES_H 1 | 
| - | 
| -/* Define to 1 if the system has the type `uint16_t'. */ | 
| -#define HAVE_UINT16_T 1 | 
| +#define HAVE_SYS_TIME_H | 
|  | 
| /* Define to 1 if you have the <unistd.h> header file. */ | 
| -#define HAVE_UNISTD_H 1 | 
| - | 
| -/* Define to 1 if the system has the type `u_int16_t'. */ | 
| -#define HAVE_U_INT16_T 1 | 
| +#define HAVE_UNISTD_H | 
|  | 
| /* Define to 1 if you have the <windows.h> header file. */ | 
| /* #undef HAVE_WINDOWS_H */ | 
|  | 
| -/* define if your compiler has __attribute__ */ | 
| -#define HAVE___ATTRIBUTE__ 1 | 
| - | 
| -/* Define to 1 if the system has the type `__int16'. */ | 
| -/* #undef HAVE___INT16 */ | 
| - | 
| -/* Name of package */ | 
| -#define PACKAGE "open-vcdiff" | 
| - | 
| -/* Define to the address where bug reports for this package should be sent. */ | 
| -#define PACKAGE_BUGREPORT "opensource@google.com" | 
| - | 
| -/* Define to the full name of this package. */ | 
| -#define PACKAGE_NAME "open-vcdiff" | 
| - | 
| -/* Define to the full name and version of this package. */ | 
| -#define PACKAGE_STRING "open-vcdiff 0.7" | 
| - | 
| -/* Define to the one symbol short name of this package. */ | 
| -#define PACKAGE_TARNAME "open-vcdiff" | 
| - | 
| -/* Define to the version of this package. */ | 
| -#define PACKAGE_VERSION "0.7" | 
| - | 
| -/* Define to 1 if you have the ANSI C header files. */ | 
| -#define STDC_HEADERS 1 | 
| - | 
| /* Use custom compare function instead of memcmp */ | 
| -#if defined(__i386__) || defined(__x86_64__) | 
| -#define VCDIFF_USE_BLOCK_COMPARE_WORDS 1 | 
| -#else | 
| /* #undef VCDIFF_USE_BLOCK_COMPARE_WORDS */ | 
| -#endif | 
|  | 
| -/* Version number of package */ | 
| -#define VERSION "0.7" | 
|  |