summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-19 15:45:22 +0100
committerVolker Lendecke <vl@samba.org>2007-12-19 16:07:19 +0100
commit712a28aaae6671be673f9b125cae59aec628d267 (patch)
tree34e92d32ab21f2934e9ad56bc179ec2b57962c68 /source3/include
parent713e1536fe4914e6df11cf10316d0b1c7c3685a3 (diff)
downloadsamba-712a28aaae6671be673f9b125cae59aec628d267.tar.gz
samba-712a28aaae6671be673f9b125cae59aec628d267.tar.bz2
samba-712a28aaae6671be673f9b125cae59aec628d267.zip
Rename cache.[ch] to memcache.[ch]
cache.h conflicts with an XFS DMAPI include on "opi" :-( (This used to be commit b8db804e07cc19d406ba3892d6eecbe16132a89a)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/memcache.h (renamed from source3/include/cache.h)4
2 files changed, 3 insertions, 3 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"