cleanups + newline at end of file

[simgrid.git] / include / xbt / trim.h

diff --git a/include/xbt/trim.h b/include/xbt/trim.h
index 39aa45b..e6f4ca5 100644 (file)
--- a/include/xbt/trim.h
+++ b/include/xbt/trim.h
@@ -11,9 +11,7 @@
 
 #include "xbt/misc.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+SG_BEGIN_DECL()
 
 /**  @brief Strip whitespace (or other characters) from the end of a string.
  *
@@ -33,8 +31,8 @@ extern "C" {
  * @return If the specified is NULL the function returns NULL. Otherwise the
  * function returns the string with whitespace stripped from the end.
  */
-char*
-XBT_PUBLIC(rtrim)(char* s, const char* char_list);
+XBT_PUBLIC(char*)
+rtrim(char* s, const char* char_list);
 
 /**  @brief Strip whitespace (or other characters) from the beginning of a string.
  *
@@ -54,8 +52,8 @@ XBT_PUBLIC(rtrim)(char* s, const char* char_list);
  * @return If the specified is NULL the function returns NULL. Otherwise the
  * function returns the string with whitespace stripped from the beginning.
  */
-char*
-XBT_PUBLIC(ltrim)( char* s, const char* char_list);
+XBT_PUBLIC(char*)
+ltrim( char* s, const char* char_list);
 
 
 /**  @brief Strip whitespace (or other characters) from the end and the begining of a string.
@@ -76,12 +74,9 @@ XBT_PUBLIC(ltrim)( char* s, const char* char_list);
  * @return If the specified is NULL the function returns NULL. Otherwise the
  * function returns the string with whitespace stripped from the end and the begining.
  */
-char* 
-XBT_PUBLIC(trim)(char* s, const char* char_list);
+XBT_PUBLIC(char*) 
+trim(char* s, const char* char_list);
 
+SG_END_DECL()
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !XBT_TRIM_H */ 
\ No newline at end of file
+#endif /* !XBT_TRIM_H */