use _WIN32 instead of WIN32 (_WIN32 is a compiler built-in)

add virtual destructor to bFile
This commit is contained in:
erwin.coumans
2010-02-06 18:50:45 +00:00
parent 744774d9ad
commit a9556d0fd5
21 changed files with 148 additions and 148 deletions

View File

@@ -37,7 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#ifdef WIN32
#ifdef _WIN32
#include <memory.h> //memcpy
#endif
#include <string.h>

View File

@@ -2,7 +2,7 @@
#define FLOAT_MATH_H
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4324) // disable padding warning
#pragma warning(disable : 4244) // disable padding warning
#pragma warning(disable : 4267) // possible loss of data

View File

@@ -33,7 +33,7 @@
#define IN_LIBXML
#include "libxml.h"
#if defined(WIN32) && !defined (__CYGWIN__)
#if defined(_WIN32) && !defined (__CYGWIN__)
#define XML_DIR_SEP '\\'
#else
#define XML_DIR_SEP '/'

View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#define __BCHUNK_H__
#ifdef WIN32
#ifdef _WIN32
#define long64 __int64
#else
#define long64 long long

View File

@@ -102,7 +102,7 @@ namespace bParse {
//todo: make memoryBuffer const char
//bFile( const char *memoryBuffer, int len);
bFile( char *memoryBuffer, int len, const char headerString[7]);
~bFile();
virtual ~bFile();
bDNA* getFileDNA()
{