mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
[8036] Move unneded defines from dotconfpp.h to dotconfpp.cpp
This will prevent unexpected redefines and unrelated files build problems.
This commit is contained in:
parent
0b4c37f751
commit
3964a0d603
3 changed files with 13 additions and 14 deletions
|
|
@ -3,6 +3,18 @@
|
||||||
|
|
||||||
#include "dotconfpp.h"
|
#include "dotconfpp.h"
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#define PATH_MAX _MAX_PATH
|
||||||
|
#define strcasecmp stricmp
|
||||||
|
#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH)
|
||||||
|
#include <io.h>
|
||||||
|
#else
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <strings.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(R_OK)
|
#if !defined(R_OK)
|
||||||
#define R_OK 04
|
#define R_OK 04
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -15,19 +15,6 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
#define PATH_MAX _MAX_PATH
|
|
||||||
#define snprintf _snprintf
|
|
||||||
#define strcasecmp stricmp
|
|
||||||
#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH)
|
|
||||||
#include <io.h>
|
|
||||||
#else
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <strings.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "mempool.h"
|
#include "mempool.h"
|
||||||
|
|
||||||
class DOTCONFDocument;
|
class DOTCONFDocument;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "8035"
|
#define REVISION_NR "8036"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue