From b29061dad6ec4bd243b594b17125d03590cfcb6d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 28 Oct 2009 14:32:03 +0000 Subject: [PATCH] Fix for building with the latest glibc Signed-off-by: Peter Lemenkov git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1584 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/dsm/mods/CMakeLists.txt | 2 +- apps/dsm/mods/mod_sys/ModSys.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/dsm/mods/CMakeLists.txt b/apps/dsm/mods/CMakeLists.txt index e37d05e9..91369c93 100644 --- a/apps/dsm/mods/CMakeLists.txt +++ b/apps/dsm/mods/CMakeLists.txt @@ -8,7 +8,7 @@ IF(MYSQLPP_FOUND) ADD_SUBDIRECTORY (mod_mysql) ENDIF(MYSQLPP_FOUND) ADD_SUBDIRECTORY (mod_py) -#ADD_SUBDIRECTORY (mod_sys) +ADD_SUBDIRECTORY (mod_sys) ADD_SUBDIRECTORY (mod_uri) ADD_SUBDIRECTORY (mod_utils) diff --git a/apps/dsm/mods/mod_sys/ModSys.cpp b/apps/dsm/mods/mod_sys/ModSys.cpp index eb26c136..3375b638 100644 --- a/apps/dsm/mods/mod_sys/ModSys.cpp +++ b/apps/dsm/mods/mod_sys/ModSys.cpp @@ -98,7 +98,12 @@ EXEC_ACTION_START(SCMkDirAction) { bool sys_get_parent_dir(const char* path, char* parentPath) { //size_t pos = strcspn(dirPath, "/\\"); - char* ptr = strrchr(path, '/'); // search char from end reverse +#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO + const char* ptr; +#else + char* ptr; +#endif + ptr = strrchr(path, '/'); // search char from end reverse if (ptr == NULL) { ptr = strrchr(path, '\\'); // search char from end reverse if (ptr == NULL) {