Browse Source

Adjust Windows build file. Use _getpid instead of getpid (deprecated alias)

pull/8/head
Thomas 3 months ago
parent
commit
b4d138f8e3
6 changed files with 287 additions and 58 deletions
  1. +4
    -25
      build-windows/libpEpAdapter.vcxproj
  2. +275
    -23
      build-windows/libpEpAdapter.vcxproj.filters
  3. +1
    -2
      src/group_manager_api.cc
  4. +1
    -2
      src/group_manager_api.h
  5. +2
    -2
      src/pEpLog.cc
  6. +4
    -4
      src/pEpLog.hh

+ 4
- 25
build-windows/libpEpAdapter.vcxproj View File

@ -58,7 +58,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>
@ -73,7 +73,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Link>
@ -86,31 +86,10 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\Adapter.cc" />
<ClCompile Include="..\src\callback_dispatcher.cc" />
<ClCompile Include="..\src\call_with_lock.cc" />
<ClCompile Include="..\src\constant_time_algo.cc" />
<ClCompile Include="..\src\message_cache.cc" />
<ClCompile Include="..\src\passphrase_cache.cc" />
<ClCompile Include="..\src\pEpLog.cc" />
<ClCompile Include="..\src\slurp.cc" />
<ClCompile Include="..\src\status_to_string.cc" />
<ClCompile Include="..\src\*.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\Adapter.hh" />
<ClInclude Include="..\src\Adapter.hxx" />
<ClInclude Include="..\src\callback_dispatcher.hh" />
<ClInclude Include="..\src\call_with_lock.hh" />
<ClInclude Include="..\src\constant_time_algo.hh" />
<ClInclude Include="..\src\locked_queue.hh" />
<ClInclude Include="..\src\message_cache.hh" />
<ClInclude Include="..\src\passphrase_cache.hh" />
<ClInclude Include="..\src\passphrase_cache.hxx" />
<ClInclude Include="..\src\pc_container.hh" />
<ClInclude Include="..\src\pEpLog.hh" />
<ClInclude Include="..\src\Semaphore.hh" />
<ClInclude Include="..\src\slurp.hh" />
<ClInclude Include="..\src\status_to_string.hh" />
<ClInclude Include="..\src\*.hh" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj">


+ 275
- 23
build-windows/libpEpAdapter.vcxproj.filters View File

@ -18,75 +18,327 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\Adapter.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\call_with_lock.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\callback_dispatcher.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\constant_time_algo.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\message_cache.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\passphrase_cache.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pEpLog.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\slurp.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\status_to_string.cc">
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\call_with_lock.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\Adapter.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\Adapter.hxx">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\callback_dispatcher.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\constant_time_algo.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\locked_queue.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\message_cache.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\passphrase_cache.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\passphrase_cache.hxx">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\pc_container.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\pEpLog.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\Semaphore.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\slurp.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\status_to_string.hh">
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

+ 1
- 2
src/group_manager_api.cc View File

@ -123,8 +123,7 @@ DYNAMIC_API PEP_STATUS adapter_group_query_groups(PEP_SESSION session, identity_
return status;
}
DYNAMIC_API PEP_STATUS
adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
DYNAMIC_API PEP_STATUS adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
{
pEpLog("called");
PEP_STATUS status = adapter_grp_manager.group_query_manager(session, group, manager);


+ 1
- 2
src/group_manager_api.h View File

@ -79,8 +79,7 @@ DYNAMIC_API PEP_STATUS adapter_group_create(
* @warning For recipients to accept the dissolution, the sender/manager key used must be a key that they
* have a trust entry for.
*/
DYNAMIC_API PEP_STATUS
adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
DYNAMIC_API PEP_STATUS adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
/**
* <!-- adapter_group_invite_member() -->


+ 2
- 2
src/pEpLog.cc View File

@ -78,7 +78,7 @@ namespace pEp {
string decorate_centered(const string& msg, char decoration)
{
stringstream tmp;
int max_len = line_width - 10;
size_t max_len = line_width - 10;
// truncate msg
string msg_truncated = msg;
if (msg.length() >= max_len) {
@ -115,7 +115,7 @@ namespace pEp {
void pEpLogger::log(const string& msg, Utils::Color col) const
{
std::stringstream msg_;
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]";
msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]";
msg_ << " - ";
msg_ << this->get_classname() << "[" << this->get_instancename() << "]";
msg_ << " - " << msg;


+ 4
- 4
src/pEpLog.hh View File

@ -49,7 +49,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \
@ -67,7 +67,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
@ -85,7 +85,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
@ -176,7 +176,7 @@ namespace pEp {
#define pEpLogClass(msg) \
do { \
std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \
msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \
msg_ << "::" << __FUNCTION__; \


Loading…
Cancel
Save