Merge branch 'memory_leakage_fix' of https://github.com/virusxp/doxygen into virusxp-memory_leakage_fix

1 files changed, 31 insertions, 26 deletions

diff --git a/src/portable.h b/src/portable.h
index c1b8c29..7160d61 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,10 +1,11 @@
 #ifndef PORTABLE_H
 #define PORTABLE_H
 
-#include <sys/types.h>
 #include <stdio.h>
-#include <qglobal.h>
-#include <qdir.h>
+#include <sys/types.h>
+
+
+
 
 #if defined(_WIN32)
 typedef __int64 portable_off_t;
@@ -16,29 +17,33 @@ typedef off_t portable_off_t;
  *  @brief Portable versions of functions that are platform dependent.
  */
 
-int            portable_system(const char *command,const char *args,bool commandHasConsole=TRUE);
-uint           portable_pid();
-const char *   portable_getenv(const char *variable);
-void           portable_setenv(const char *variable,const char *value);
-void           portable_unsetenv(const char *variable);
-portable_off_t portable_fseek(FILE *f,portable_off_t offset, int whence);
-portable_off_t portable_ftell(FILE *f);
-FILE *         portable_fopen(const char *fileName,const char *mode);
-void           portable_unlink(const char *fileName);
-char           portable_pathSeparator();
-char           portable_pathListSeparator();
-const char *   portable_ghostScriptCommand();
-const char *   portable_commandExtension();
-bool           portable_fileSystemIsCaseSensitive();
-FILE *         portable_popen(const char *name,const char *type);
-int            portable_pclose(FILE *stream);
-void           portable_sysTimerStart();
-void           portable_sysTimerStop();
-double         portable_getSysElapsedTime();
-void           portable_sleep(int ms);
-bool           portable_isAbsolutePath(const char *fileName);
-void           portable_correct_path(void);
-void           portable_setShortDir(void);
+namespace Portables
+{
+  int            system(const char *command,const char *args,bool commandHasConsole=true);
+  unsigned int   pid(void);
+  const char *   getenv(const char *variable);
+  void           setenv(const char *variable,const char *value);
+  void           unsetenv(const char *variable);
+  portable_off_t fseek(FILE *f,portable_off_t offset, int whence);
+  portable_off_t ftell(FILE *f);
+  FILE *         fopen(const char *fileName,const char *mode);
+  void           unlink(const char *fileName);
+  char           pathSeparator(void);
+  char           pathListSeparator(void);
+  const char *   ghostScriptCommand(void);
+  const char *   commandExtension(void);
+  bool           fileSystemIsCaseSensitive();
+  FILE *         popen(const char *name,const char *type);
+  int            pclose(FILE *stream);
+  void           sysTimerStart(void);
+  void           sysTimerStop(void);
+  double         getSysElapsedTime(void);
+  void           sleep(int ms);
+  bool           isAbsolutePath(const char *fileName);
+  void           correct_path(void);
+  void           setShortDir(void);
+}
+
 
 extern "C" {
   void *         portable_iconv_open(const char* tocode, const char* fromcode);