mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 09:23:03 -04:00
dtool_config.h: remove some macros for ancient C++ compilers
This commit is contained in:
parent
4f55e26e61
commit
190c553c57
@ -83,21 +83,6 @@ using namespace std;
|
|||||||
|
|
||||||
#define TYPENAME typename
|
#define TYPENAME typename
|
||||||
|
|
||||||
#ifndef HAVE_WCHAR_T
|
|
||||||
// Some C++ libraries (os x 3.1) don't define this.
|
|
||||||
typedef unsigned short wchar_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_WSTRING
|
|
||||||
// Some C++ libraries (gcc 2.95) don't define this.
|
|
||||||
typedef basic_string<wchar_t> wstring;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some C++ libraries (Irix) don't define this.
|
|
||||||
typedef long streamsize;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_IOS_TYPEDEFS
|
#ifndef HAVE_IOS_TYPEDEFS
|
||||||
typedef int ios_openmode;
|
typedef int ios_openmode;
|
||||||
typedef int ios_fmtflags;
|
typedef int ios_fmtflags;
|
||||||
|
@ -13,11 +13,6 @@
|
|||||||
|
|
||||||
#include "lineStreamBuf.h"
|
#include "lineStreamBuf.h"
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers--notably SGI--don't define this for us.
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -23,11 +23,6 @@
|
|||||||
#include "openssl/rand.h"
|
#include "openssl/rand.h"
|
||||||
#include "openssl/evp.h"
|
#include "openssl/evp.h"
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers (notably SGI) don't define this for us
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif /* HAVE_STREAMSIZE */
|
|
||||||
|
|
||||||
// The iteration count is scaled by this factor for writing to the stream.
|
// The iteration count is scaled by this factor for writing to the stream.
|
||||||
static const int iteration_count_factor = 1000;
|
static const int iteration_count_factor = 1000;
|
||||||
|
|
||||||
|
@ -2278,8 +2278,6 @@ DTOOL_CONFIG=[
|
|||||||
("DEFAULT_PATHSEP", '";"', '":"'),
|
("DEFAULT_PATHSEP", '";"', '":"'),
|
||||||
("WORDS_BIGENDIAN", 'UNDEF', 'UNDEF'),
|
("WORDS_BIGENDIAN", 'UNDEF', 'UNDEF'),
|
||||||
("PHAVE_LOCKF", '1', '1'),
|
("PHAVE_LOCKF", '1', '1'),
|
||||||
("HAVE_WCHAR_T", '1', '1'),
|
|
||||||
("HAVE_WSTRING", '1', '1'),
|
|
||||||
("SIMPLE_STRUCT_POINTERS", '1', 'UNDEF'),
|
("SIMPLE_STRUCT_POINTERS", '1', 'UNDEF'),
|
||||||
("HAVE_DINKUM", 'UNDEF', 'UNDEF'),
|
("HAVE_DINKUM", 'UNDEF', 'UNDEF'),
|
||||||
("HAVE_STL_HASH", 'UNDEF', 'UNDEF'),
|
("HAVE_STL_HASH", 'UNDEF', 'UNDEF'),
|
||||||
@ -2289,7 +2287,6 @@ DTOOL_CONFIG=[
|
|||||||
("PHAVE_GETOPT_H", 'UNDEF', '1'),
|
("PHAVE_GETOPT_H", 'UNDEF', '1'),
|
||||||
("PHAVE_LINUX_INPUT_H", 'UNDEF', '1'),
|
("PHAVE_LINUX_INPUT_H", 'UNDEF', '1'),
|
||||||
("IOCTL_TERMINAL_WIDTH", 'UNDEF', '1'),
|
("IOCTL_TERMINAL_WIDTH", 'UNDEF', '1'),
|
||||||
("HAVE_STREAMSIZE", '1', '1'),
|
|
||||||
("HAVE_IOS_TYPEDEFS", '1', '1'),
|
("HAVE_IOS_TYPEDEFS", '1', '1'),
|
||||||
("HAVE_IOS_BINARY", '1', '1'),
|
("HAVE_IOS_BINARY", '1', '1'),
|
||||||
("STATIC_INIT_GETENV", '1', 'UNDEF'),
|
("STATIC_INIT_GETENV", '1', 'UNDEF'),
|
||||||
|
@ -24,11 +24,6 @@
|
|||||||
#undef X509_NAME
|
#undef X509_NAME
|
||||||
#endif // WIN32_VC
|
#endif // WIN32_VC
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers (notably SGI) don't define this for us
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif /* HAVE_STREAMSIZE */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -18,11 +18,6 @@
|
|||||||
// This module is not compiled if OpenSSL is not available.
|
// This module is not compiled if OpenSSL is not available.
|
||||||
#ifdef HAVE_OPENSSL
|
#ifdef HAVE_OPENSSL
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers (notably SGI) don't define this for us
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif /* HAVE_STREAMSIZE */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -17,11 +17,6 @@
|
|||||||
#ifdef HAVE_OPENSSL
|
#ifdef HAVE_OPENSSL
|
||||||
#include "httpChannel.h"
|
#include "httpChannel.h"
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers (notably SGI) don't define this for us
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif /* HAVE_STREAMSIZE */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -24,11 +24,6 @@
|
|||||||
// recursion.
|
// recursion.
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers--notably SGI--don't define this for us.
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Closes or deletes the relevant pointers, if _owns_obj is true.
|
* Closes or deletes the relevant pointers, if _owns_obj is true.
|
||||||
*/
|
*/
|
||||||
|
@ -15,11 +15,6 @@
|
|||||||
#include "pnotify.h"
|
#include "pnotify.h"
|
||||||
#include "memoryHook.h"
|
#include "memoryHook.h"
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers (notably SGI) don't define this for us
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif /* HAVE_STREAMSIZE */
|
|
||||||
|
|
||||||
static const size_t substream_buffer_size = 4096;
|
static const size_t substream_buffer_size = 4096;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,11 +17,6 @@
|
|||||||
|
|
||||||
#include "pnotify.h"
|
#include "pnotify.h"
|
||||||
|
|
||||||
#ifndef HAVE_STREAMSIZE
|
|
||||||
// Some compilers--notably SGI--don't define this for us.
|
|
||||||
typedef int streamsize;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user