janwas
04127c7af3
- topology.cpp: modify interface due to thread-safety issue. caller is now responsible for ensuring the first _Detect call isn't reentered; everything else is safe. - fix thread-safety issue in wnuma; use winit mechanism to ensure it's ready before use - VFS now takes a cacheSize parameter (required for being able to disable read-only file caches for the image loader at work) - allow dynarray that isn't actually holding memory - debug_stl: VC9 fix (disable this code except on the exact STL version on which it was tested) - zlib, lib_api: changes to macro used to toggle between static and dynamic linking - add boost filesystem header in external_libraries - amd64: cpu_ topology functions are now provided by x86_x64 - cpu: remove cpu_ClockFrequency (dangerous, may be tempting to use during WHRT init which would cause a crash). use x86_x64_ClockFrequency or os_cpu_ClockFrequency instead. - werrno: cope with newer boost versions - wmman: follow SUSv3 in rejecting zero-length mappings This was SVN commit r5954.
39 lines
1004 B
C
39 lines
1004 B
C
/**
|
|
* =========================================================================
|
|
* File : zlib.h
|
|
* Project : 0 A.D.
|
|
* Description : bring in ZLib header+library, with compatibility fixes
|
|
* =========================================================================
|
|
*/
|
|
|
|
// license: GPL; see lib/license.txt
|
|
|
|
#ifndef INCLUDED_ZLIB
|
|
#define INCLUDED_ZLIB
|
|
|
|
// zlib.h -> zconf.h includes <windows.h>, which causes conflicts.
|
|
// define the include guard to prevent it from actually being included and
|
|
// then manually define the few things that are actually needed.
|
|
#define _WINDOWS_ // windows.h include guard
|
|
#ifndef WINAPI
|
|
# define WINAPI __stdcall
|
|
# define WINAPIV __cdecl
|
|
#endif
|
|
|
|
#ifndef ZLIB_STATIC
|
|
#define ZLIB_DLL
|
|
#endif
|
|
|
|
#include <zlib.h>
|
|
|
|
// automatically link against the required library
|
|
#if MSC_VERSION
|
|
# ifdef NDEBUG
|
|
# pragma comment(lib, "zlib1.lib")
|
|
# else
|
|
# pragma comment(lib, "zlib1d.lib")
|
|
# endif
|
|
#endif
|
|
|
|
#endif // #ifndef INCLUDED_ZLIB
|