diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-15 03:05:46 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-15 09:07:11 +0200 |
| commit | 5c400afeaa92e21c50638327324217d110be6d8b (patch) | |
| tree | 85545abcc9b39b2e3cca00dc3487b38bc86a7d86 /source4 | |
| parent | 1a94aaedc30bd175a0b1dc80df34ceb1a91a8ec3 (diff) | |
| download | samba-5c400afeaa92e21c50638327324217d110be6d8b.tar.gz | |
Remove unused CONST_DISCARD macro.
(cherry picked from commit 75783473d180661257e3f0e3d300179caf34bd8e)
(cherry picked from commit 5c75c1406fd6bdd6319070cb4098929c28eeba94)
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 87ed4d82513..a1eb4f4b468 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 ddda21f9d8e..d9b7759e7e9 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) |