The branch, v3-2-test has been updated via b8db804e07cc19d406ba3892d6eecbe16132a89a (commit) from 7b528647879bb55c9c85243a3e2906c09490edc9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit b8db804e07cc19d406ba3892d6eecbe16132a89a Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Wed Dec 19 15:45:22 2007 +0100 Rename cache.[ch] to memcache.[ch] cache.h conflicts with an XFS DMAPI include on "opi" :-( ----------------------------------------------------------------------- Summary of changes: source/include/includes.h | 2 +- source/include/{cache.h => memcache.h} | 4 ++-- source/lib/{cache.c => memcache.c} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename source/include/{cache.h => memcache.h} (96%) rename source/lib/{cache.c => memcache.c} (99%) Changeset truncated at 500 lines: diff --git a/source/include/includes.h b/source/include/includes.h index a45176a..fdeff34 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -719,7 +719,7 @@ typedef char fstring[FSTRING_LEN]; #include "packet.h" #include "ctdbd_conn.h" #include "talloc_stack.h" -#include "cache.h" +#include "memcache.h" /* used in net.c */ struct functable { diff --git a/source/include/cache.h b/source/include/memcache.h similarity index 96% rename from source/include/cache.h rename to source/include/memcache.h index 460a33b..f849f8a 100644 --- a/source/include/cache.h +++ b/source/include/memcache.h @@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __CACHE_H__ -#define __CACHE_H__ +#ifndef __MEMCACHE_H__ +#define __MEMCACHE_H__ #include "includes.h" diff --git a/source/lib/cache.c b/source/lib/memcache.c similarity index 99% rename from source/lib/cache.c rename to source/lib/memcache.c index baf2fe3..1763006 100644 --- a/source/lib/cache.c +++ b/source/lib/memcache.c @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "cache.h" +#include "memcache.h" #include "rbtree.h" struct memcache_element { -- Samba Shared Repository