Linux needs stdarg.h for va_args

[flightgear.git] / src / Main / util.hxx

diff --git a/src/Main/util.hxx b/src/Main/util.hxx
index acb25ac0d070c7d47c895ea1e9f00e529c79a56f..5172ca23e12be59494122c3444fe62fdda68617b 100644 (file)
--- a/src/Main/util.hxx
+++ b/src/Main/util.hxx
@@ -17,14 +17,10 @@
 //
 // $Id$
 
-
 #ifndef __UTIL_HXX
 #define __UTIL_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
+#include <string>
 
 /**
  * Move a value towards a target.
@@ -37,17 +33,7 @@
  *        (elapsed time/smoothing time)
  * @return The new value.
  */
-extern double fgGetLowPass (double current, double target, double timeratio);
-
-
-/**
- * Unescape string.
- *
- * @param str String possibly containing escaped characters.
- * @return string with escaped characters replaced by single character values.
- */
-extern std::string fgUnescape (const char *str);
-
+double fgGetLowPass (double current, double target, double timeratio);
 
 /**
  * Validation listener interface for io.nas, used by fgcommands.
@@ -55,6 +41,7 @@ extern std::string fgUnescape (const char *str);
  * @param write True for write operations and false for read operations.
  * @return The validated path on success or 0 if access denied.
  */
-extern const char *fgValidatePath (const char *path, bool write);
+const char *fgValidatePath (const char *path, bool write);
+std::string fgValidatePath(const std::string& path, bool write);
 
 #endif // __UTIL_HXX