rpms/3Depict
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Add patch for upstream broken release build

Browse source 
- isNotDirectory was hidden by ifdef
This commit is contained in:
mycae 2014-04-26 09:44:00 -04:00
commit 09a1da71c3
2 changed files with 65 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

60
3Depict-0.0.16-patch-debug-build.patch Normal file
View file

@ -0,0 +1,60 @@
diff -r 084988518fe8 src/common/basics.cpp
--- a/src/common/basics.cpp Sat Apr 26 09:27:35 2014 -0400
+++ b/src/common/basics.cpp Sat Apr 26 09:42:07 2014 -0400
@@ -1115,6 +1115,28 @@
return 0;
}
+//FIXME: Why negative?
+bool isNotDirectory(const char *filename)
+{
+#if !defined(__WIN32__) && !defined(__WIN64__)
+ struct stat statbuf;
+
+ if(stat(filename,&statbuf) == -1)
+ return false;
+
+ return (statbuf.st_mode !=S_IFDIR);
+#else
+
+ WARN(false, "Untested function. calling win api");
+ DWORD fileAttribs;
+ fileAttribs=GetFileAttributes((LPCWSTR)filename);
+ if(fileAttribs == INVALID_FILE_ATTRIBUTES)
+ return false;
+
+ return !(fileAttribs & FILE_ATTRIBUTE_DIRECTORY);
+#endif
+}
+
#ifdef DEBUG
bool isValidXML(const char *filename)
{
@@ -1148,27 +1170,6 @@
}
-//FIXME: Why negative?
-bool isNotDirectory(const char *filename)
-{
-#if !defined(__WIN32__) && !defined(__WIN64__)
- struct stat statbuf;
-
- if(stat(filename,&statbuf) == -1)
- return false;
-
- return (statbuf.st_mode !=S_IFDIR);
-#else
-
- WARN(false, "Untested function. calling win api");
- DWORD fileAttribs;
- fileAttribs=GetFileAttributes((LPCWSTR)filename);
- if(fileAttribs == INVALID_FILE_ATTRIBUTES)
- return false;
-
- return !(fileAttribs & FILE_ATTRIBUTE_DIRECTORY);
-#endif
-}
bool rmFile(const std::string &filename)
{