summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/memcache.h (renamed from source3/include/cache.h)4
-rw-r--r--source3/lib/memcache.c (renamed from source3/lib/cache.c)2
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a45176aba3..fdeff346e5 100644
--- a/source3/include/includes.h
+++ b/source3/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/source3/include/cache.h b/source3/include/memcache.h
index 460a33b3a1..f849f8ad3b 100644
--- a/source3/include/cache.h
+++ b/source3/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/source3/lib/cache.c b/source3/lib/memcache.c
index baf2fe3984..17630066ae 100644
--- a/source3/lib/cache.c
+++ b/source3/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 {