First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_internal.h

diff --git a/libmemcached/memcached_internal.h b/libmemcached/memcached_internal.h
index cda67a200d7d9e2abf41e121801644ea4abe2ac0..3e4415ddea34b5d20cd12e16d57a13b2748d8b75 100644 (file)
--- a/libmemcached/memcached_internal.h
+++ b/libmemcached/memcached_internal.h
@@ -1,25 +1,35 @@
-/*
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
  * Summary: Internal functions used by the library. Not for public use!
- * Copy: See Copyright for the status of this software.
  *
- * Author: Trond Norbye
  */
 
-#if !defined(MEMCACHED_INTERNAL_H) && defined(MEMCACHED_INTERNAL)
-#define MEMCACHED_INTERNAL_H
+#ifndef LIBMEMCACHED_MEMCACHED_INTERNAL_H
+#define LIBMEMCACHED_MEMCACHED_INTERNAL_H
+
+#if defined(BUILDING_LIBMEMCACHED)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void libmemcached_free(memcached_st *ptr __attribute__((unused)), void *mem);
-void *libmemcached_malloc(memcached_st *ptr __attribute__((unused)), 
-                          const size_t size);
-void *libmemcached_realloc(memcached_st *ptr __attribute__((unused)), 
-                           void *mem, const size_t size);
+LIBMEMCACHED_LOCAL
+void libmemcached_free(memcached_st *ptr, void *mem);
+LIBMEMCACHED_LOCAL
+void *libmemcached_malloc(memcached_st *ptr, const size_t size);
+LIBMEMCACHED_LOCAL
+void *libmemcached_realloc(memcached_st *ptr, void *mem, const size_t size);
+LIBMEMCACHED_LOCAL
+void *libmemcached_calloc(memcached_st *ptr, size_t nelem, size_t size);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* MEMCACHED_INTERNAL_H */
+#endif /* BUILDING_LIBMEMCACHED */
+#endif /* LIBMEMCACHED_MEMCACHED_INTERNAL_H */