X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_stringf.h;h=69627993cb45c9caffdaca59d415bd95af831399;hb=cc91f4f6b469483cf8e01f8a0beec543ceed4bf6;hp=aaa87fd2513bf08d8e04ed2df2c7d2b6831055b4;hpb=18baf4d4fe523d84ad741d7fde0f10a58d47587b;p=synfig.git diff --git a/ETL/trunk/ETL/_stringf.h b/ETL/trunk/ETL/_stringf.h index aaa87fd..6962799 100644 --- a/ETL/trunk/ETL/_stringf.h +++ b/ETL/trunk/ETL/_stringf.h @@ -41,8 +41,10 @@ #endif #ifdef WIN32 +#define POPEN_BINARY_READ_TYPE "rb" #define POPEN_BINARY_WRITE_TYPE "wb" #else +#define POPEN_BINARY_READ_TYPE "r" #define POPEN_BINARY_WRITE_TYPE "w" #endif @@ -196,10 +198,12 @@ dirname(const std::string &str) break; if(iter==str.begin()) + { if (*iter==ETL_DIRECTORY_SEPARATOR) return "/"; else return "."; + } return std::string(str.begin(),iter); }