Commit bcc9b4bd authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Fix merge conflicts between head and RE25

parent 964213e2
......@@ -548,10 +548,10 @@ AC_DEFUN([OL_BDB_COMPAT],
# define DB_VERSION_MINOR 0
#endif
#ifndef DB_VERSION_PATCH
# define DB_VERSION_PATCH 0
# define DB_VERSION_PATCH 0
#endif
#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
/* require 4.4 or later, but less than 6.0.20 */
#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
......
#! /bin/sh
# From configure.in Id: 810b2fa7f4d7cddaa014d0727a62cd13d1b7068f .
# From configure.in Id: 72cd4c0631fb2e0f29b8d66eb4786d97441f5249 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65.
#
......@@ -20379,10 +20379,10 @@ else
# define DB_VERSION_MINOR 0
#endif
#ifndef DB_VERSION_PATCH
# define DB_VERSION_PATCH 0
# define DB_VERSION_PATCH 0
#endif
 
#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
/* require 4.4 or later, but less than 6.0.20 */
#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment