includes: Remove some unnecessary declarations

To accommodate removing file_lines_load() from here, drop the #ifdef
around the declaration in util.h.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(Imported from commit 9726e17e366382776c87a8aaa63884665c604896)

diff --git a/include/internal/includes.h b/include/internal/includes.h
index 185575a16873b74d1b1038e4a288ebcd2f60a622..79d664fc7341c518d48ce0ad7d8d9454aa22c776 100644 (file)
--- a/include/internal/includes.h
+++ b/include/internal/includes.h
@@ -39,9 +39,6 @@ struct timeval timeval_until(const struct timeval *tv1,
                             const struct timeval *tv2);
 _PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
 double timeval_elapsed(struct timeval *tv);
-char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
-char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len);
-_PUBLIC_ int set_blocking(int fd, bool set);
 
 #include "lib/util/debug.h"
 #include "lib/util/util.h"

diff --git a/lib/util/util.h b/lib/util/util.h
index 74a6ac0fb99d828af3c5ccba50d8519f8c49837e..8473cae554b4207d742ed4bb6a3ee3208d9209ce 100644 (file)
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -319,13 +319,11 @@ mmap (if possible) or read a file
 **/
 _PUBLIC_ void *map_file(const char *fname, size_t size);
 
-#ifdef _SAMBA_BUILD_
 /**
 load a file into memory and return an array of pointers to lines in the file
 must be freed with talloc_free(). 
 **/
 _PUBLIC_ char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
-#endif
 
 /**
 load a fd into memory and return an array of pointers to lines in the file