Skip to content

Commit

Permalink
Rerun configure to update linux/config.h and mac/config.h for
Browse files Browse the repository at this point in the history
open-vcdiff 0.7.

Linux: Ubuntu Lucid 10.04
Mac: Mac OS X 10.5 with Xcode 3.1.4

It seems that the original linux/config.h was incorrectly generated.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6732031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79888 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
wtc@chromium.org committed Mar 30, 2011
1 parent 8a070fb commit 28c56bb
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 37 deletions.
7 changes: 6 additions & 1 deletion sdch/README.chromium
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
The linux directory contains a config.h generated from a run of configure on
Ubuntu 10.04.1 LTS x86_64, with VCDIFF_USE_BLOCK_COMPARE_WORDS manually
changed to match the $host_cpu test in configure.

The mac directory contains a config.h generated from a run of configure on a
Mac.
Mac, with VCDIFF_USE_BLOCK_COMPARE_WORDS manually changed to match the
$host_cpu test in configure.
70 changes: 37 additions & 33 deletions sdch/linux/config.h
Original file line number Diff line number Diff line change
@@ -1,113 +1,117 @@
/* src/config.h. Generated by SCons. */
/* 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. */
/* #undef HAVE_DLFCN_H */
#define HAVE_DLFCN_H 1

/* 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. */
/* #undef HAVE_FNMATCH_H */
#define HAVE_FNMATCH_H 1

/* Define to 1 if you have the <getopt.h> header file. */
/* #undef HAVE_GETOPT_H */
#define HAVE_GETOPT_H 1

/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
#define HAVE_GETTIMEOFDAY 1

/* Define to 1 if you have the <inttypes.h> header file. */
/* #undef HAVE_INTTYPES_H */
#define HAVE_INTTYPES_H 1

/* Define to 1 if you have the <malloc.h> header file. */
/* #undef HAVE_MALLOC_H */
#define HAVE_MALLOC_H 1

/* Define to 1 if you have the `memalign' function. */
/* #undef HAVE_MEMALIGN */
#define HAVE_MEMALIGN 1

/* Define to 1 if you have the <memory.h> header file. */
/* #undef HAVE_MEMORY_H */
#define HAVE_MEMORY_H 1

/* Define to 1 if you have the `mprotect' function. */
/* #undef HAVE_MPROTECT */
#define HAVE_MPROTECT 1

/* Define to 1 if you have the `posix_memalign' function. */
/* #undef HAVE_POSIX_MEMALIGN */
#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. */
/* #undef HAVE_STDINT_H */
#define HAVE_STDINT_H 1

/* Define to 1 if you have the <stdlib.h> header file. */
/* #undef HAVE_STDLIB_H */
#define HAVE_STDLIB_H 1

/* Define to 1 if you have the <strings.h> header file. */
/* #undef HAVE_STRINGS_H */
#define HAVE_STRINGS_H 1

/* Define to 1 if you have the <string.h> header file. */
/* #undef HAVE_STRING_H */
#define HAVE_STRING_H 1

/* Define to 1 if you have the `strtoll' function. */
/* #undef HAVE_STRTOLL */
#define HAVE_STRTOLL 1

/* Define to 1 if you have the `strtoq' function. */
/* #undef HAVE_STRTOQ */
#define HAVE_STRTOQ 1

/* Define to 1 if you have the <sys/mman.h> header file. */
/* #undef HAVE_SYS_MMAN_H */
#define HAVE_SYS_MMAN_H 1

/* Define to 1 if you have the <sys/stat.h> header file. */
/* #undef HAVE_SYS_STAT_H */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/time.h> header file. */
/* #undef HAVE_SYS_TIME_H */
#define HAVE_SYS_TIME_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
/* #undef HAVE_SYS_TYPES_H */
#define HAVE_SYS_TYPES_H 1

/* Define to 1 if the system has the type `uint16_t'. */
/* #undef HAVE_UINT16_T */
#define HAVE_UINT16_T 1

/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
#define HAVE_UNISTD_H 1

/* Define to 1 if the system has the type `u_int16_t'. */
/* #undef HAVE_U_INT16_T */
#define HAVE_U_INT16_T 1

/* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */

/* define if your compiler has __attribute__ */
/* #undef HAVE___ATTRIBUTE__ */
#define HAVE___ATTRIBUTE__ 1

/* Define to 1 if the system has the type `__int16'. */
/* #undef HAVE___INT16 */

/* Name of package */
/* #undef PACKAGE */
#define PACKAGE "open-vcdiff"

/* Define to the address where bug reports for this package should be sent. */
/* #undef PACKAGE_BUGREPORT */
#define PACKAGE_BUGREPORT "opensource@google.com"

/* Define to the full name of this package. */
/* #undef PACKAGE_NAME */
#define PACKAGE_NAME "open-vcdiff"

/* Define to the full name and version of this package. */
/* #undef PACKAGE_STRING */
#define PACKAGE_STRING "open-vcdiff 0.7"

/* Define to the one symbol short name of this package. */
/* #undef PACKAGE_TARNAME */
#define PACKAGE_TARNAME "open-vcdiff"

/* Define to the version of this package. */
/* #undef PACKAGE_VERSION */
#define PACKAGE_VERSION "0.7"

/* Define to 1 if you have the ANSI C header files. */
/* #undef STDC_HEADERS */
#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 */
/* #undef VERSION */
#define VERSION "0.7"
11 changes: 8 additions & 3 deletions sdch/mac/config.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* 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. */
Expand Down Expand Up @@ -94,19 +95,23 @@
#define PACKAGE_NAME "open-vcdiff"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "open-vcdiff 0.1"
#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.1"
#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.1"
#define VERSION "0.7"

0 comments on commit 28c56bb

Please sign in to comment.