diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index d33df08406..792e90131a 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -42,7 +42,7 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc) AC_CONFIG_FILES(librpc/dcerpc_samr.pc) AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [], +SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0, [], [ m4_include(../lib/talloc/libtalloc.m4) SMB_INCLUDE_MK(../lib/talloc/config.mk) diff --git a/source4/include/includes.h b/source4/include/includes.h index ddda21f9d8..d9b7759e7e 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -64,10 +64,6 @@ /* String routines */ #include "../lib/util/safe_string.h" -#ifndef CONST_DISCARD -#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) -#endif - #if 0 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */ #define TALLOC_ABORT(reason) smb_panic(reason) |