Rename cache.[ch] to memcache.[ch]

cache.h conflicts with an XFS DMAPI include on "opi" :-(
(This used to be commit b8db804e07cc19d406ba3892d6eecbe16132a89a)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index a45176aba303ece972158f0293ada4b86f24ae6f..fdeff346e540b64119971d089614dd7e529a9adb 100644 (file)
--- 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
similarity index 96%
rename from source3/include/cache.h
rename to source3/include/memcache.h
index 460a33b3a1f0d8f0b54a8d1c6585b0cf8d64400e..f849f8ad3be892bd2842cd6afc59aa09c720c82e 100644 (file)
--- 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
similarity index 99%
rename from source3/lib/cache.c
rename to source3/lib/memcache.c
index baf2fe398469d9b9ad9fb8e2adc0011c1631ae05..17630066ae2a395dceccb8881692cfe8c6216f15 100644 (file)
--- 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 {