diff --git a/Frameworks/OakSystem/src/application.cc b/Frameworks/OakSystem/src/application.cc index 698b156384..8f712e3226 100644 --- a/Frameworks/OakSystem/src/application.cc +++ b/Frameworks/OakSystem/src/application.cc @@ -1,9 +1,9 @@ #include "application.h" -#include "process.h" #include #include #include #include +#include #include OAK_DEBUG_VAR(Application); diff --git a/Frameworks/OakSystem/src/process.cc b/Frameworks/OakSystem/src/process.cc index 6310a39dd3..bfeae290b4 100644 --- a/Frameworks/OakSystem/src/process.cc +++ b/Frameworks/OakSystem/src/process.cc @@ -1,6 +1,7 @@ #include "process.h" #include #include +#include #include #include #include @@ -98,23 +99,6 @@ namespace oak new kill_process_group_in_background_t(groupId); } - c_array::c_array (std::map const& map) - { - char** p = new char* [map.size() + 1]; - _array = p; - iterate(pair, map) - *p++ = strdup((pair->first + "=" + pair->second).c_str()); - *p = NULL; - } - - c_array::~c_array () - { - char* const* p = _array; - while(p && *p) - free(*p++); - delete[] _array; - } - struct process_server_t { process_server_t (); diff --git a/Frameworks/OakSystem/src/process.h b/Frameworks/OakSystem/src/process.h index a5031b9ade..1a67eea1fe 100644 --- a/Frameworks/OakSystem/src/process.h +++ b/Frameworks/OakSystem/src/process.h @@ -9,15 +9,6 @@ namespace oak PUBLIC std::map const& basic_environment (); PUBLIC void kill_process_group_in_background (pid_t groupId); - struct PUBLIC c_array - { - c_array (std::map const& map); - ~c_array (); - operator char* const* () const { return _array; } - private: - char* const* _array; - }; - struct PUBLIC process_t { WATCH_LEAKS(oak::process_t); diff --git a/Frameworks/network/src/filter_tbz.h b/Frameworks/network/src/filter_tbz.h index 11e83462c3..ab4ec984dd 100644 --- a/Frameworks/network/src/filter_tbz.h +++ b/Frameworks/network/src/filter_tbz.h @@ -4,7 +4,7 @@ #include "download.h" // filter_t #include #include -#include +#include #include #include diff --git a/Frameworks/network/src/tbz.cc b/Frameworks/network/src/tbz.cc index babb98e3a5..aef0b9f404 100644 --- a/Frameworks/network/src/tbz.cc +++ b/Frameworks/network/src/tbz.cc @@ -1,6 +1,7 @@ #include "tbz.h" #include #include +#include namespace network { diff --git a/Shared/include/oak/datatypes.h b/Shared/include/oak/datatypes.h new file mode 100644 index 0000000000..7adadb0f85 --- /dev/null +++ b/Shared/include/oak/datatypes.h @@ -0,0 +1,35 @@ +#ifndef OAK_DATATYPES_H_665IJ16Q +#define OAK_DATATYPES_H_665IJ16Q + +namespace oak +{ + namespace + { + struct c_array + { + c_array (std::map const& map) + { + char** p = new char* [map.size() + 1]; + _array = p; + iterate(pair, map) + *p++ = strdup((pair->first + "=" + pair->second).c_str()); + *p = NULL; + } + + ~c_array () + { + char* const* p = _array; + while(p && *p) + free(*p++); + delete[] _array; + } + + operator char* const* () const { return _array; } + + private: + char* const* _array; + }; + } +} + +#endif /* end of include guard: OAK_DATATYPES_H_665IJ16Q */