summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Norbye <Trond.Norbye@sun.com>2009-03-02 13:28:00 +0100
committerTrond Norbye <Trond.Norbye@sun.com>2009-03-02 20:59:11 +0100
commitf06bd30835a6df5f589892ffa394701273e95934 (patch)
tree84d477b5e1d09386921f16ea2668c5d6e3b37e74
parent0185c9ed264b08b773733a138bc11de5fe515d05 (diff)
downloadmemcached-f06bd30835a6df5f589892ffa394701273e95934.tar.gz
Added trace.h to the list of sources to be included in the dist target
-rw-r--r--Makefile.am3
-rw-r--r--trace.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 34a8a76..a867515 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ memcached_SOURCES = memcached.c memcached.h \
items.c items.h \
assoc.c assoc.h \
thread.c daemon.c \
- stats.c stats.h
+ stats.c stats.h \
+ trace.h
memcached_debug_SOURCES = $(memcached_SOURCES)
memcached_CPPFLAGS = -DNDEBUG
memcached_LDADD = @DTRACE_OBJ@
diff --git a/trace.h b/trace.h
index 7d1363e..ced30a3 100644
--- a/trace.h
+++ b/trace.h
@@ -1,8 +1,9 @@
+#ifndef TRACE_H
+#define TRACE_H
#ifdef ENABLE_DTRACE
#include "memcached_dtrace.h"
#else
-
#define MEMCACHED_ASSOC_DELETE(arg0, arg1, arg2)
#define MEMCACHED_ASSOC_DELETE_ENABLED() (0)
#define MEMCACHED_ASSOC_FIND(arg0, arg1, arg2)
@@ -63,5 +64,6 @@
#define MEMCACHED_SLABS_SLABCLASS_ALLOCATE_ENABLED() (0)
#define MEMCACHED_SLABS_SLABCLASS_ALLOCATE_FAILED(arg0)
#define MEMCACHED_SLABS_SLABCLASS_ALLOCATE_FAILED_ENABLED() (0)
+#endif
#endif