Fixes #14: We now have a CMake build option, translated into a defined value, controlling whether or not to alias printf(), sprintf() etc.

Author: Eyal Rozenberg

CMakeLists.txt

@@ -29,6 +29,16 @@ if (NOT SUPPORT_PTRDIFF_ARGUMENTS)
 	add_definitions(-DPRINTF_DISABLE_SUPPORT_PTRDIFF_T)
 endif()
 
+option(ALIAS_STANDARD_FUNCTION_NAMES "Alias the relevant standard library function (printf, sprintf etc.) to the library's implementations" ON)
+if (NOT ALIAS_STANDARD_FUNCTION_NAMES)
+	add_definitions(-DALIAS_STANDARD_FUNCTION_NAMES)
+endif()
+
+option(ALIAS_STANDARD_FUNCTION_NAMES "Alias the relevant standard library function (printf, sprintf etc.) to the library's implementations" ON)
+if (NOT ALIAS_STANDARD_FUNCTION_NAMES)
+	add_definitions(-DALIAS_STANDARD_FUNCTION_NAMES)
+endif()
+
 # numeric defines
 
 set(INTEGER_TO_STRING_BUFFER_SIZE "32" CACHE STRING "Integer to string (ntoa) conversion buffer size")

printf.h

@@ -49,6 +49,15 @@ __attribute__((format(__printf__, (one_based_format_index), (first_arg))))
 # define ATTR_VPRINTF(one_based_format_index)
 #endif
 
+#ifdef ALIAS_STANDARD_FUNCTION_NAMES
+# define printf    printf_
+# define sprintf   sprintf_
+# define vsprintf  vsprintf_
+# define snprintf  snprintf_
+# define vsnprintf vsnprintf_
+# define vprintf   vprintf_
+#endif
+
 
 /**
  * Output a character to a custom device like UART, used by the printf() function
@@ -66,7 +75,6 @@ void _putchar(char character);
  * \param format A string that specifies the format of the output
  * \return The number of characters that are written into the array, not counting the terminating null character
  */
-#define printf printf_
 int printf_(const char* format, ...) ATTR_PRINTF(1, 2);
 
 
@@ -78,8 +86,6 @@ int printf_(const char* format, ...) ATTR_PRINTF(1, 2);
  * \param va A value identifying a variable arguments list
  * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character
  */
-#define sprintf  sprintf_
-#define vsprintf vsprintf_
 int  sprintf_(char* buffer, const char* format, ...) ATTR_PRINTF(2, 3);
 int vsprintf_(char* buffer, const char* format, va_list va) ATTR_VPRINTF(2);
 
@@ -94,8 +100,6 @@ int vsprintf_(char* buffer, const char* format, va_list va) ATTR_VPRINTF(2);
  *         null character. A value equal or larger than count indicates truncation. Only when the returned value
  *         is non-negative and less than count, the string has been completely written.
  */
-#define snprintf  snprintf_
-#define vsnprintf vsnprintf_
 int  snprintf_(char* buffer, size_t count, const char* format, ...) ATTR_PRINTF(3, 4);
 int vsnprintf_(char* buffer, size_t count, const char* format, va_list va) ATTR_VPRINTF(3);
 
@@ -106,7 +110,6 @@ int vsnprintf_(char* buffer, size_t count, const char* format, va_list va) ATTR_
  * \param va A value identifying a variable arguments list
  * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character
  */
-#define vprintf vprintf_
 int vprintf_(const char* format, va_list va) ATTR_VPRINTF(1);