Annotation of ports/games/megaglest/base/patches/patch-source_shared_lib_sources_platform_common_platform_common_cpp, Revision 1.1
1.1 ! yason 1: $OpenBSD$
! 2: --- source/shared_lib/sources/platform/common/platform_common.cpp.orig Sun Apr 10 15:44:57 2011
! 3: +++ source/shared_lib/sources/platform/common/platform_common.cpp Sun Apr 10 15:48:10 2011
! 4: @@ -455,7 +455,7 @@ int32 getFolderTreeContentsCheckSumRecursively(const s
! 5: glob_t globbuf;
! 6:
! 7: int res = glob(mypath.c_str(), 0, 0, &globbuf);
! 8: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 9: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 10: if(res < 0) {
! 11: std::stringstream msg;
! 12: msg << "#2 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 13: @@ -491,13 +491,13 @@ int32 getFolderTreeContentsCheckSumRecursively(const s
! 14: globfree(&globbuf);
! 15:
! 16: // Look recursively for sub-folders
! 17: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 18: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 19: res = glob(mypath.c_str(), 0, 0, &globbuf);
! 20: #else
! 21: res = glob(mypath.c_str(), GLOB_ONLYDIR, 0, &globbuf);
! 22: #endif
! 23:
! 24: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 25: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 26: if(res < 0) {
! 27: std::stringstream msg;
! 28: msg << "#3 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 29: @@ -506,7 +506,7 @@ int32 getFolderTreeContentsCheckSumRecursively(const s
! 30: #endif
! 31:
! 32: for(int i = 0; i < globbuf.gl_pathc; ++i) {
! 33: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 34: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 35: struct stat statStruct;
! 36: // only process if dir..
! 37: int actStat = lstat( globbuf.gl_pathv[i], &statStruct);
! 38: @@ -597,7 +597,7 @@ vector<string> getFolderTreeContentsListRecursively(co
! 39: glob_t globbuf;
! 40:
! 41: int res = glob(mypath.c_str(), 0, 0, &globbuf);
! 42: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 43: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 44: if(res < 0) {
! 45: std::stringstream msg;
! 46: msg << "#4 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 47: @@ -631,13 +631,13 @@ vector<string> getFolderTreeContentsListRecursively(co
! 48: globfree(&globbuf);
! 49:
! 50: // Look recursively for sub-folders
! 51: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 52: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 53: res = glob(mypath.c_str(), 0, 0, &globbuf);
! 54: #else //APPLE doesn't have the GLOB_ONLYDIR definition..
! 55: res = glob(mypath.c_str(), GLOB_ONLYDIR, 0, &globbuf);
! 56: #endif
! 57:
! 58: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 59: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 60: if(res < 0) {
! 61: std::stringstream msg;
! 62: msg << "#5 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 63: @@ -646,7 +646,7 @@ vector<string> getFolderTreeContentsListRecursively(co
! 64: #endif
! 65:
! 66: for(int i = 0; i < globbuf.gl_pathc; ++i) {
! 67: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 68: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 69: struct stat statStruct;
! 70: // only get if dir..
! 71: int actStat = lstat( globbuf.gl_pathv[ i], &statStruct);
! 72: @@ -702,7 +702,7 @@ vector<std::pair<string,int32> > getFolderTreeContents
! 73:
! 74: int res = glob(mypath.c_str(), 0, 0, &globbuf);
! 75:
! 76: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 77: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 78: if(res < 0) {
! 79: std::stringstream msg;
! 80: msg << "#6 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 81: @@ -736,13 +736,13 @@ vector<std::pair<string,int32> > getFolderTreeContents
! 82: globfree(&globbuf);
! 83:
! 84: // Look recursively for sub-folders
! 85: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 86: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 87: res = glob(mypath.c_str(), 0, 0, &globbuf);
! 88: #else //APPLE doesn't have the GLOB_ONLYDIR definition..
! 89: res = glob(mypath.c_str(), GLOB_ONLYDIR, 0, &globbuf);
! 90: #endif
! 91:
! 92: -#if !defined(__APPLE__) && !defined(__FreeBSD__)
! 93: +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
! 94: if(res < 0) {
! 95: std::stringstream msg;
! 96: msg << "#7 Couldn't scan directory '" << mypath << "': " << strerror(errno);
! 97: @@ -751,7 +751,7 @@ vector<std::pair<string,int32> > getFolderTreeContents
! 98: #endif
! 99:
! 100: for(int i = 0; i < globbuf.gl_pathc; ++i) {
! 101: -#if defined(__APPLE__) || defined(__FreeBSD__)
! 102: +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
! 103: struct stat statStruct;
! 104: // only get if dir..
! 105: int actStat = lstat( globbuf.gl_pathv[ i], &statStruct);
CVSweb