Commit 3c345ba2 authored by jan.koester's avatar jan.koester
Browse files

tetst

parent 9312c702

CMakeLists.txt

+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ if(APPLE OR ${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD") 
    find_package(date REQUIRED)

endif()



add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DWIN32_LEAN_AND_MEAN)

add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DWIN32_LEAN_AND_MEAN -DNOMINMAX)



include_directories(

    ${NETPLUS_INCLUDE_DIRS}

editor/CMakeLists.txt

+1 −1
Changes for editor/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ if(NOT TARGET blogidev) 
    find_package(Brotli REQUIRED)

    find_package(paritypp REQUIRED)

    find_package(ZLIB REQUIRED)

    add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DWIN32_LEAN_AND_MEAN)

    add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DWIN32_LEAN_AND_MEAN -DNOMINMAX)

endif()



configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

editor/src/htmlimport.cpp

+4 −5
Changes for editor/src/htmlimport.cpp: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -35,14 +35,13 @@ 
#include <sstream>

#include <stack>



// sockaddr/sockaddr_in/sockaddr_in6/AF_INET/addrinfo/getaddrinfo/freeaddrinfo

// below come in transitively via netplus/socket.h (pulled in by

// httppp/http.h), which already picks the right POSIX vs Winsock headers --

// no need to duplicate that split here with our own #ifdef.

#include <httppp/http.h>

#include <httppp/httpdefinitions.h>



#include <netdb.h>

#include <sys/socket.h>

#include <netinet/in.h>

#include <arpa/inet.h>



#include <zlib.h>

#include <uuidp.h>

src/blogi.cpp

+1 −1
Changes for src/blogi.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static bool handleDeployFallback(libhttppp::HttpRequest &curreq, const int tid, 
}



blogi::Blogi::Blogi(std::vector<netplus::socket *> serversocket, bool debug)

    : HttpEvent(serversocket, 1000, static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN))), _debug(debug)

    : HttpEvent(serversocket, 1000, static_cast<size_t>(std::thread::hardware_concurrency())), _debug(debug)

{

    Blogi::ActiveInstance = this;