tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows build fix.

This commit is contained in:
Gunnar Beutner 2014-05-22 21:32:08 +02:00
parent c2dadc5f88
commit 1bc1356fe6
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/process.cpp
View File

@ -233,16 +233,16 @@ void Process::IOThreadProc(int tid)
#endif /* _WIN32 */ #endif /* _WIN32 */
for (int i = 1; i < count; i++) { for (int i = 1; i < count; i++) {
std::map<ProcessHandle, Process::Ptr>::iterator it;
#ifdef _WIN32
it = l_Processes[tid].find(handles[i]);
#else /* _WIN32 */
std::map<ConsoleHandle, ProcessHandle>::iterator it2; std::map<ConsoleHandle, ProcessHandle>::iterator it2;
it2 = l_FDs[tid].find(pfds[i].fd); it2 = l_FDs[tid].find(pfds[i].fd);
if (it2 == l_FDs[tid].end()) if (it2 == l_FDs[tid].end())
continue; /* This should never happen. */ continue; /* This should never happen. */
std::map<ProcessHandle, Process::Ptr>::iterator it;
#ifdef _WIN32
it = l_Processes[tid].find(handles[i]);
#else /* _WIN32 */
it = l_Processes[tid].find(it2->second); it = l_Processes[tid].find(it2->second);
#endif /* _WIN32 */ #endif /* _WIN32 */

4
lib/base/utility.cpp
View File

@ -477,8 +477,8 @@ bool Utility::Glob(const String& pathSpec, const boost::function<void (const Str
String path = DirName(pathSpec) + "/" + wfd.cFileName; String path = DirName(pathSpec) + "/" + wfd.cFileName;
if ((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobDirectory)) if ((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobDirectory))
dirs.push_back(path) dirs.push_back(path);
else if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobFile) else if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobFile))
files.push_back(path); files.push_back(path);
} while (FindNextFile(handle, &wfd)); } while (FindNextFile(handle, &wfd));

3
lib/icinga/customvarobject.h
View File

@ -20,6 +20,7 @@
#ifndef CUSTOMVAROBJECT_H #ifndef CUSTOMVAROBJECT_H
#define CUSTOMVAROBJECT_H #define CUSTOMVAROBJECT_H
#include "icinga/i2-icinga.h"
#include "icinga/customvarobject.th" #include "icinga/customvarobject.th"
#include "base/dynamicobject.h" #include "base/dynamicobject.h"
#include "remote/messageorigin.h" #include "remote/messageorigin.h"
@ -53,7 +54,7 @@ enum ModifiedAttributeType
* *
* @ingroup icinga * @ingroup icinga
*/ */
class I2_BASE_API CustomVarObject : public ObjectImpl<CustomVarObject> class I2_ICINGA_API CustomVarObject : public ObjectImpl<CustomVarObject>
{ {
public: public:
DECLARE_PTR_TYPEDEFS(CustomVarObject); DECLARE_PTR_TYPEDEFS(CustomVarObject);