smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from kiwix/fix_kiwix-serve 

Remove unnecessary include.
This commit is contained in:
Matthieu Gautier 2019-06-12 14:33:33 +02:00 committed by GitHub
parent 7c1d051305 4e746916a7
commit 687a15877a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/kiwixserve.h
View File

@ -1,15 +1,7 @@
#ifndef KIWIXLIB_KIWIX_SERVE_H_ #ifndef KIWIXLIB_KIWIX_SERVE_H_
#define KIWIXLIB_KIWIX_SERVE_H_ #define KIWIXLIB_KIWIX_SERVE_H_
#ifdef _WIN32
// winsock2.h need to be included before windows.h (included by curl.h)
# include <winsock2.h>
#endif
#include <sys/types.h>
#include <unistd.h>
#include <memory> #include <memory>
#include "tools/pathTools.h"
class Subprocess; class Subprocess;
namespace kiwix { namespace kiwix {

4
src/kiwixserve.cpp
View File

@ -3,10 +3,14 @@
#ifdef _WIN32 #ifdef _WIN32
# define KIWIXSERVE_CMD "kiwix-serve.exe" # define KIWIXSERVE_CMD "kiwix-serve.exe"
# include <windows.h>
#else #else
# define KIWIXSERVE_CMD "kiwix-serve" # define KIWIXSERVE_CMD "kiwix-serve"
# include <unistd.h>
#endif #endif
#include "tools/pathTools.h"
namespace kiwix { namespace kiwix {
KiwixServe::KiwixServe() : m_port(8181) KiwixServe::KiwixServe() : m_port(8181)

5
src/tools/pathTools.cpp
View File

@ -29,11 +29,6 @@
#define getcwd _getcwd // stupid MSFT "deprecation" warning #define getcwd _getcwd // stupid MSFT "deprecation" warning
#endif #endif
#ifdef _WIN32
#else
#include <unistd.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
const std::string SEPARATOR("\\"); const std::string SEPARATOR("\\");
#else #else