X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions.h;h=893da2ac9346d8f441b94aeea1ed137e14b373bf;hb=6dab5e4d5dfb6145966a3efa48a41cf7e609c9ad;hp=85fb8502afc88747568079f8dfa2ba3538d150d1;hpb=1edb76c1dfdf6307d010307b6f04bed3ce22e3a2;p=awesomized%2Flibmemcached

diff --git a/libmemcached/options.h b/libmemcached/options.h
index 85fb8502..893da2ac 100644
--- a/libmemcached/options.h
+++ b/libmemcached/options.h
@@ -44,14 +44,11 @@ extern "C" {
 LIBMEMCACHED_API
   memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size);
 
-LIBMEMCACHED_API
-  memcached_return_t memcached_parse_configuration(memcached_st *ptr, const char *option_string, size_t length);
-
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
   void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length);
 
 LIBMEMCACHED_LOCAL
-  memcached_return_t memcached_parse_configure_file(memcached_st *ptr, const char *filename, size_t filename_length);
+  memcached_return_t memcached_parse_configuration(memcached_st *ptr, const char *option_string, size_t length);
 
 LIBMEMCACHED_LOCAL
   const char *memcached_parse_filename(memcached_st *memc);
@@ -62,3 +59,13 @@ LIBMEMCACHED_LOCAL
 #ifdef __cplusplus
 }
 #endif
+
+#ifdef __cplusplus
+
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configure_file(memcached_st *self, const char *filename, size_t length);
+
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configure_file(memcached_st *self, memcached_array_st *filename);
+
+#endif