summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/util/util.h4
-rw-r--r--lib/util/util_str.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/util/util.h b/lib/util/util.h
index 8bbaa0e393..8dffece0da 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -371,12 +371,10 @@ _PUBLIC_ bool set_boolean(const char *boolean_string, bool *boolean);
*/
_PUBLIC_ bool conv_str_bool(const char * str, bool * val);
-#if _SAMBA_BUILD_ == 4
/**
* Convert a size specification like 16K into an integral number of bytes.
**/
-_PUBLIC_ bool conv_str_size(const char * str, uint64_t * val);
-#endif
+_PUBLIC_ bool conv_str_size_error(const char * str, uint64_t * val);
/**
* Parse a uint64_t value from a string
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index cf1b07ff0f..cf3d60df8f 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -175,7 +175,7 @@ _PUBLIC_ bool conv_str_bool(const char * str, bool * val)
/**
* Convert a size specification like 16K into an integral number of bytes.
**/
-_PUBLIC_ bool conv_str_size(const char * str, uint64_t * val)
+_PUBLIC_ bool conv_str_size_error(const char * str, uint64_t * val)
{
char * end = NULL;
unsigned long long lval;