From f1eb811c0e27acca4b2c24ce7ee6e64df24fb628 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Thu, 7 Jun 2018 16:59:54 -0600 Subject: [PATCH] general: Break apart BUILDING_PANDAEXPRESS --- panda/src/downloader/bioPtr.h | 2 +- panda/src/downloader/bioStream.h | 6 ++-- panda/src/downloader/bioStreamBuf.h | 2 +- panda/src/downloader/bioStreamPtr.h | 2 +- panda/src/downloader/config_downloader.cxx | 4 +-- panda/src/downloader/config_downloader.h | 10 +++---- panda/src/downloader/decompressor.h | 2 +- panda/src/downloader/documentSpec.h | 2 +- panda/src/downloader/downloadDb.h | 8 ++--- panda/src/downloader/download_utils.h | 4 +-- panda/src/downloader/extractor.h | 2 +- panda/src/downloader/httpAuthorization.h | 2 +- panda/src/downloader/httpChannel.h | 2 +- panda/src/downloader/httpClient.h | 2 +- panda/src/downloader/httpCookie.h | 2 +- panda/src/downloader/httpDate.h | 2 +- panda/src/downloader/httpEntityTag.h | 2 +- panda/src/downloader/httpEnum.h | 2 +- panda/src/downloader/identityStreamBuf.h | 2 +- panda/src/downloader/multiplexStream.h | 2 +- panda/src/downloader/multiplexStreamBuf.h | 2 +- panda/src/downloader/patcher.h | 2 +- panda/src/downloader/socketStream.h | 10 +++---- panda/src/downloader/stringStream.h | 2 +- panda/src/downloader/stringStreamBuf.h | 2 +- panda/src/downloader/urlSpec.h | 2 +- panda/src/downloader/virtualFileHTTP.h | 2 +- panda/src/downloader/virtualFileMountHTTP.h | 2 +- panda/src/express/buffer.h | 2 +- panda/src/express/checksumHashGenerator.h | 2 +- panda/src/express/compress_string.cxx | 4 +-- panda/src/express/compress_string.h | 12 ++++---- panda/src/express/config_express.cxx | 4 +-- panda/src/express/config_express.h | 24 +++++++-------- panda/src/express/copy_stream.h | 2 +- panda/src/express/datagram.h | 2 +- panda/src/express/datagramGenerator.h | 2 +- panda/src/express/datagramIterator.h | 2 +- panda/src/express/datagramSink.h | 2 +- panda/src/express/dcast.h | 2 +- panda/src/express/encrypt_string.cxx | 4 +-- panda/src/express/encrypt_string.h | 12 ++++---- panda/src/express/error_utils.h | 8 ++--- panda/src/express/fileReference.h | 2 +- panda/src/express/hashGeneratorBase.h | 2 +- panda/src/express/hashVal.h | 2 +- panda/src/express/memoryUsage.h | 2 +- panda/src/express/memoryUsagePointers.h | 2 +- panda/src/express/multifile.h | 2 +- panda/src/express/namable.h | 2 +- panda/src/express/nodeReferenceCount.h | 2 +- panda/src/express/openSSLWrapper.h | 2 +- panda/src/express/pStatCollectorForwardBase.h | 2 +- panda/src/express/password_hash.h | 6 ++-- panda/src/express/patchfile.h | 2 +- panda/src/express/pointerToArrayBase.cxx | 2 +- panda/src/express/pointerToVoid.h | 2 +- panda/src/express/profileTimer.cxx | 2 +- panda/src/express/profileTimer.h | 4 +-- panda/src/express/pta_double.h | 8 ++--- panda/src/express/pta_float.h | 8 ++--- panda/src/express/pta_int.h | 8 ++--- panda/src/express/pta_uchar.h | 10 +++---- panda/src/express/ramfile.h | 2 +- panda/src/express/referenceCount.h | 2 +- panda/src/express/subStream.h | 6 ++-- panda/src/express/subStreamBuf.h | 2 +- panda/src/express/subfileInfo.h | 2 +- panda/src/express/temporaryFile.h | 2 +- panda/src/express/trueClock.h | 2 +- panda/src/express/typedReferenceCount.h | 2 +- panda/src/express/virtualFile.h | 2 +- panda/src/express/virtualFileComposite.h | 2 +- panda/src/express/virtualFileList.h | 2 +- panda/src/express/virtualFileMount.h | 2 +- .../express/virtualFileMountAndroidAsset.h | 2 +- panda/src/express/virtualFileMountMultifile.h | 2 +- panda/src/express/virtualFileMountRamdisk.h | 2 +- panda/src/express/virtualFileMountSystem.h | 2 +- panda/src/express/virtualFileSimple.h | 2 +- panda/src/express/virtualFileSystem.h | 2 +- panda/src/express/weakPointerCallback.h | 2 +- panda/src/express/weakPointerToVoid.h | 2 +- panda/src/express/weakReferenceList.h | 2 +- panda/src/express/windowsRegistry.h | 2 +- panda/src/express/zStream.h | 4 +-- panda/src/express/zStreamBuf.h | 2 +- panda/src/pandabase/pandasymbols.h | 30 ++++++++++++++----- 88 files changed, 170 insertions(+), 156 deletions(-) diff --git a/panda/src/downloader/bioPtr.h b/panda/src/downloader/bioPtr.h index d0c2e88b9d..253073f745 100644 --- a/panda/src/downloader/bioPtr.h +++ b/panda/src/downloader/bioPtr.h @@ -39,7 +39,7 @@ class URLSpec; * on these things internally, but the interface doesn't appear to be public; * so we might as well wrap the whole thing at the high level. */ -class EXPCL_PANDAEXPRESS BioPtr : public ReferenceCount { +class EXPCL_PANDA_DOWNLOADER BioPtr : public ReferenceCount { public: INLINE BioPtr(BIO *bio); BioPtr(const URLSpec &url); diff --git a/panda/src/downloader/bioStream.h b/panda/src/downloader/bioStream.h index b47a17020a..0c68ed253d 100644 --- a/panda/src/downloader/bioStream.h +++ b/panda/src/downloader/bioStream.h @@ -29,7 +29,7 @@ * * Seeking is not supported. */ -class EXPCL_PANDAEXPRESS IBioStream : public ISocketStream { +class EXPCL_PANDA_DOWNLOADER IBioStream : public ISocketStream { public: INLINE IBioStream(); INLINE IBioStream(BioPtr *source); @@ -51,7 +51,7 @@ private: * * Seeking is not supported. */ -class EXPCL_PANDAEXPRESS OBioStream : public OSocketStream { +class EXPCL_PANDA_DOWNLOADER OBioStream : public OSocketStream { public: INLINE OBioStream(); INLINE OBioStream(BioPtr *source); @@ -69,7 +69,7 @@ private: * A bi-directional stream object that reads and writes data to an OpenSSL BIO * object. */ -class EXPCL_PANDAEXPRESS BioStream : public SocketStream { +class EXPCL_PANDA_DOWNLOADER BioStream : public SocketStream { public: INLINE BioStream(); INLINE BioStream(BioPtr *source); diff --git a/panda/src/downloader/bioStreamBuf.h b/panda/src/downloader/bioStreamBuf.h index b588105e69..9e8fadad0b 100644 --- a/panda/src/downloader/bioStreamBuf.h +++ b/panda/src/downloader/bioStreamBuf.h @@ -25,7 +25,7 @@ /** * The streambuf object that implements IBioStream. */ -class EXPCL_PANDAEXPRESS BioStreamBuf : public std::streambuf { +class EXPCL_PANDA_DOWNLOADER BioStreamBuf : public std::streambuf { public: BioStreamBuf(); virtual ~BioStreamBuf(); diff --git a/panda/src/downloader/bioStreamPtr.h b/panda/src/downloader/bioStreamPtr.h index 3f23040d20..5e28fa2ba1 100644 --- a/panda/src/downloader/bioStreamPtr.h +++ b/panda/src/downloader/bioStreamPtr.h @@ -26,7 +26,7 @@ * A wrapper around an BioStream object to make a reference-counting pointer * to it. */ -class EXPCL_PANDAEXPRESS BioStreamPtr : public ReferenceCount { +class EXPCL_PANDA_DOWNLOADER BioStreamPtr : public ReferenceCount { public: INLINE BioStreamPtr(BioStream *stream); virtual ~BioStreamPtr(); diff --git a/panda/src/downloader/config_downloader.cxx b/panda/src/downloader/config_downloader.cxx index 9c806dba07..4e60b4028c 100644 --- a/panda/src/downloader/config_downloader.cxx +++ b/panda/src/downloader/config_downloader.cxx @@ -19,8 +19,8 @@ #include "pandaSystem.h" -#if !defined(CPPPARSER) && !defined(BUILDING_PANDAEXPRESS) - #error Buildsystem error: BUILDING_PANDAEXPRESS not defined +#if !defined(CPPPARSER) && !defined(BUILDING_PANDA_DOWNLOADER) + #error Buildsystem error: BUILDING_PANDA_DOWNLOADER not defined #endif ConfigureDef(config_downloader); diff --git a/panda/src/downloader/config_downloader.h b/panda/src/downloader/config_downloader.h index 2ffd9be37a..6a6ea1dfb7 100644 --- a/panda/src/downloader/config_downloader.h +++ b/panda/src/downloader/config_downloader.h @@ -24,8 +24,8 @@ #include "configVariableFilename.h" #include "configVariableList.h" -ConfigureDecl(config_downloader, EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS); -NotifyCategoryDecl(downloader, EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS); +ConfigureDecl(config_downloader, EXPCL_PANDA_DOWNLOADER, EXPTP_PANDA_DOWNLOADER); +NotifyCategoryDecl(downloader, EXPCL_PANDA_DOWNLOADER, EXPTP_PANDA_DOWNLOADER); extern ConfigVariableInt downloader_byte_rate; extern ConfigVariableBool download_throttle; @@ -44,9 +44,9 @@ extern ConfigVariableInt http_skip_body_size; extern ConfigVariableDouble http_idle_timeout; extern ConfigVariableInt http_max_connect_count; -extern EXPCL_PANDAEXPRESS ConfigVariableInt tcp_header_size; -extern EXPCL_PANDAEXPRESS ConfigVariableBool support_ipv6; +extern EXPCL_PANDA_DOWNLOADER ConfigVariableInt tcp_header_size; +extern EXPCL_PANDA_DOWNLOADER ConfigVariableBool support_ipv6; -extern EXPCL_PANDAEXPRESS void init_libdownloader(); +extern EXPCL_PANDA_DOWNLOADER void init_libdownloader(); #endif diff --git a/panda/src/downloader/decompressor.h b/panda/src/downloader/decompressor.h index 414dca6687..16fe2d65fb 100644 --- a/panda/src/downloader/decompressor.h +++ b/panda/src/downloader/decompressor.h @@ -26,7 +26,7 @@ class Ramfile; * This manages run-time decompression of a zlib-compressed stream, as a * background or foreground task. */ -class EXPCL_PANDAEXPRESS Decompressor { +class EXPCL_PANDA_DOWNLOADER Decompressor { PUBLISHED: Decompressor(); ~Decompressor(); diff --git a/panda/src/downloader/documentSpec.h b/panda/src/downloader/documentSpec.h index c9328f56a6..e78b2eca62 100644 --- a/panda/src/downloader/documentSpec.h +++ b/panda/src/downloader/documentSpec.h @@ -27,7 +27,7 @@ * The DocumentSpec may also be used to request a newer document than a * particular one if available, for instance to refresh a cached document. */ -class EXPCL_PANDAEXPRESS DocumentSpec { +class EXPCL_PANDA_DOWNLOADER DocumentSpec { PUBLISHED: INLINE DocumentSpec(); INLINE DocumentSpec(const std::string &url); diff --git a/panda/src/downloader/downloadDb.h b/panda/src/downloader/downloadDb.h index f879098811..a6bd580446 100644 --- a/panda/src/downloader/downloadDb.h +++ b/panda/src/downloader/downloadDb.h @@ -59,7 +59,7 @@ MultifileRecord is a Vector * the files on the client system, and another copy for the server, * representing the files the server has available. */ -class EXPCL_PANDAEXPRESS DownloadDb { +class EXPCL_PANDA_DOWNLOADER DownloadDb { PUBLISHED: // Status of a multifile is stored in this enum Note these values are in // increasing order of "doneness" So if you are decompressed, you are @@ -131,7 +131,7 @@ PUBLISHED: public: - class EXPCL_PANDAEXPRESS FileRecord : public ReferenceCount { + class EXPCL_PANDA_DOWNLOADER FileRecord : public ReferenceCount { public: FileRecord(); FileRecord(std::string name); @@ -141,7 +141,7 @@ public: typedef pvector< PT(FileRecord) > FileRecords; - class EXPCL_PANDAEXPRESS MultifileRecord : public ReferenceCount { + class EXPCL_PANDA_DOWNLOADER MultifileRecord : public ReferenceCount { public: MultifileRecord(); MultifileRecord(std::string name, Phase phase, int size, int status); @@ -162,7 +162,7 @@ public: typedef pvector< PT(MultifileRecord) > MultifileRecords; - class EXPCL_PANDAEXPRESS Db { + class EXPCL_PANDA_DOWNLOADER Db { public: Db(); void write(std::ostream &out) const; diff --git a/panda/src/downloader/download_utils.h b/panda/src/downloader/download_utils.h index cd27e86666..f3167bf537 100644 --- a/panda/src/downloader/download_utils.h +++ b/panda/src/downloader/download_utils.h @@ -21,8 +21,8 @@ BEGIN_PUBLISH -EXPCL_PANDAEXPRESS unsigned long check_crc(Filename name); -EXPCL_PANDAEXPRESS unsigned long check_adler(Filename name); +EXPCL_PANDA_DOWNLOADER unsigned long check_crc(Filename name); +EXPCL_PANDA_DOWNLOADER unsigned long check_adler(Filename name); END_PUBLISH diff --git a/panda/src/downloader/extractor.h b/panda/src/downloader/extractor.h index b69b11c0f2..de89351a88 100644 --- a/panda/src/downloader/extractor.h +++ b/panda/src/downloader/extractor.h @@ -32,7 +32,7 @@ * Multifile. Call run() whenever you have spare cycles until run() returns * EU_success. */ -class EXPCL_PANDAEXPRESS Extractor { +class EXPCL_PANDA_DOWNLOADER Extractor { PUBLISHED: Extractor(); ~Extractor(); diff --git a/panda/src/downloader/httpAuthorization.h b/panda/src/downloader/httpAuthorization.h index fcc08103e3..65d49d7366 100644 --- a/panda/src/downloader/httpAuthorization.h +++ b/panda/src/downloader/httpAuthorization.h @@ -33,7 +33,7 @@ class URLSpec; * in the past, which can possibly be re-used for future requests to the same * server. */ -class EXPCL_PANDAEXPRESS HTTPAuthorization : public ReferenceCount { +class EXPCL_PANDA_DOWNLOADER HTTPAuthorization : public ReferenceCount { public: typedef pmap Tokens; typedef pmap AuthenticationSchemes; diff --git a/panda/src/downloader/httpChannel.h b/panda/src/downloader/httpChannel.h index 758fc95394..f2bf891db6 100644 --- a/panda/src/downloader/httpChannel.h +++ b/panda/src/downloader/httpChannel.h @@ -51,7 +51,7 @@ class HTTPClient; * requested from the same HTTPChannel until the first document has been fully * retrieved. */ -class EXPCL_PANDAEXPRESS HTTPChannel : public TypedReferenceCount { +class EXPCL_PANDA_DOWNLOADER HTTPChannel : public TypedReferenceCount { private: HTTPChannel(HTTPClient *client); diff --git a/panda/src/downloader/httpClient.h b/panda/src/downloader/httpClient.h index d8f78d57b4..93490fe642 100644 --- a/panda/src/downloader/httpClient.h +++ b/panda/src/downloader/httpClient.h @@ -53,7 +53,7 @@ class HTTPChannel; * There is a default, global HTTPClient available in * HTTPClient::get_global_ptr(). */ -class EXPCL_PANDAEXPRESS HTTPClient : public ReferenceCount { +class EXPCL_PANDA_DOWNLOADER HTTPClient : public ReferenceCount { PUBLISHED: HTTPClient(); HTTPClient(const HTTPClient ©); diff --git a/panda/src/downloader/httpCookie.h b/panda/src/downloader/httpCookie.h index 5a8e49eda8..dfbc507215 100644 --- a/panda/src/downloader/httpCookie.h +++ b/panda/src/downloader/httpCookie.h @@ -29,7 +29,7 @@ * A cookie sent from an HTTP server to be stored on the client and returned * when the path and/or domain matches. */ -class EXPCL_PANDAEXPRESS HTTPCookie { +class EXPCL_PANDA_DOWNLOADER HTTPCookie { PUBLISHED: INLINE HTTPCookie(); INLINE explicit HTTPCookie(const std::string &format, const URLSpec &url); diff --git a/panda/src/downloader/httpDate.h b/panda/src/downloader/httpDate.h index 15950a854b..4ee58dcf30 100644 --- a/panda/src/downloader/httpDate.h +++ b/panda/src/downloader/httpDate.h @@ -24,7 +24,7 @@ * conversely, it can accept a time_t value and encode it for output as a * string. */ -class EXPCL_PANDAEXPRESS HTTPDate { +class EXPCL_PANDA_DOWNLOADER HTTPDate { PUBLISHED: INLINE HTTPDate(); INLINE HTTPDate(time_t time); diff --git a/panda/src/downloader/httpEntityTag.h b/panda/src/downloader/httpEntityTag.h index bf1a144946..7388b8621f 100644 --- a/panda/src/downloader/httpEntityTag.h +++ b/panda/src/downloader/httpEntityTag.h @@ -21,7 +21,7 @@ * identify a particular version of a document or resource, particularly * useful for verifying caches. */ -class EXPCL_PANDAEXPRESS HTTPEntityTag { +class EXPCL_PANDA_DOWNLOADER HTTPEntityTag { PUBLISHED: INLINE HTTPEntityTag(); HTTPEntityTag(const std::string &text); diff --git a/panda/src/downloader/httpEnum.h b/panda/src/downloader/httpEnum.h index 81ec9f0243..1beec15753 100644 --- a/panda/src/downloader/httpEnum.h +++ b/panda/src/downloader/httpEnum.h @@ -26,7 +26,7 @@ * This class is just used as a namespace wrapper for some of the enumerated * types used by various classes within the HTTPClient family. */ -class EXPCL_PANDAEXPRESS HTTPEnum { +class EXPCL_PANDA_DOWNLOADER HTTPEnum { PUBLISHED: enum HTTPVersion { HV_09, // HTTP 0.9 or older diff --git a/panda/src/downloader/identityStreamBuf.h b/panda/src/downloader/identityStreamBuf.h index 548e946999..f889bb1714 100644 --- a/panda/src/downloader/identityStreamBuf.h +++ b/panda/src/downloader/identityStreamBuf.h @@ -28,7 +28,7 @@ class HTTPChannel; /** * The streambuf object that implements IIdentityStream. */ -class EXPCL_PANDAEXPRESS IdentityStreamBuf : public std::streambuf { +class EXPCL_PANDA_DOWNLOADER IdentityStreamBuf : public std::streambuf { public: IdentityStreamBuf(); virtual ~IdentityStreamBuf(); diff --git a/panda/src/downloader/multiplexStream.h b/panda/src/downloader/multiplexStream.h index d47c2cf118..90b00d1e01 100644 --- a/panda/src/downloader/multiplexStream.h +++ b/panda/src/downloader/multiplexStream.h @@ -28,7 +28,7 @@ * a disk file or to system logging utilities. It's a very handy thing to set * Notify to refer to when running in batch mode. */ -class EXPCL_PANDAEXPRESS MultiplexStream : public std::ostream { +class EXPCL_PANDA_DOWNLOADER MultiplexStream : public std::ostream { PUBLISHED: INLINE MultiplexStream(); diff --git a/panda/src/downloader/multiplexStreamBuf.h b/panda/src/downloader/multiplexStreamBuf.h index 24ec97cfb6..8126b5894e 100644 --- a/panda/src/downloader/multiplexStreamBuf.h +++ b/panda/src/downloader/multiplexStreamBuf.h @@ -24,7 +24,7 @@ * Used by MultiplexStream to implement an ostream that sends what is written * to it to any number of additional sources, like other ostreams. */ -class EXPCL_PANDAEXPRESS MultiplexStreamBuf : public std::streambuf { +class EXPCL_PANDA_DOWNLOADER MultiplexStreamBuf : public std::streambuf { public: MultiplexStreamBuf(); virtual ~MultiplexStreamBuf(); diff --git a/panda/src/downloader/patcher.h b/panda/src/downloader/patcher.h index bf4ffdd351..bc2d30e7bc 100644 --- a/panda/src/downloader/patcher.h +++ b/panda/src/downloader/patcher.h @@ -25,7 +25,7 @@ /** * Applies a patch synchronously */ -class EXPCL_PANDAEXPRESS Patcher { +class EXPCL_PANDA_DOWNLOADER Patcher { PUBLISHED: Patcher(); explicit Patcher(PT(Buffer) buffer); diff --git a/panda/src/downloader/socketStream.h b/panda/src/downloader/socketStream.h index b98e76927f..6d52e0e79a 100644 --- a/panda/src/downloader/socketStream.h +++ b/panda/src/downloader/socketStream.h @@ -36,7 +36,7 @@ class HTTPChannel; * class for both ISocketStream and SocketStream; its purpose is to minimize * redundant code between them. Do not use it directly. */ -class EXPCL_PANDAEXPRESS SSReader { +class EXPCL_PANDA_DOWNLOADER SSReader { public: SSReader(std::istream *stream); virtual ~SSReader(); @@ -86,7 +86,7 @@ private: * class for both OSocketStream and SocketStream; its purpose is to minimize * redundant code between them. Do not use it directly. */ -class EXPCL_PANDAEXPRESS SSWriter { +class EXPCL_PANDA_DOWNLOADER SSWriter { public: SSWriter(std::ostream *stream); virtual ~SSWriter(); @@ -122,7 +122,7 @@ private: * after an eof condition to check whether the socket has been closed, or * whether more data may be available later. */ -class EXPCL_PANDAEXPRESS ISocketStream : public std::istream, public SSReader { +class EXPCL_PANDA_DOWNLOADER ISocketStream : public std::istream, public SSReader { public: INLINE ISocketStream(std::streambuf *buf); virtual ~ISocketStream(); @@ -156,7 +156,7 @@ private: * check whether the socket has been closed, or whether more data may be sent * later. */ -class EXPCL_PANDAEXPRESS OSocketStream : public std::ostream, public SSWriter { +class EXPCL_PANDA_DOWNLOADER OSocketStream : public std::ostream, public SSWriter { public: INLINE OSocketStream(std::streambuf *buf); @@ -175,7 +175,7 @@ PUBLISHED: * A base class for iostreams that read and write to a (possibly non-blocking) * socket. */ -class EXPCL_PANDAEXPRESS SocketStream : public std::iostream, public SSReader, public SSWriter { +class EXPCL_PANDA_DOWNLOADER SocketStream : public std::iostream, public SSReader, public SSWriter { public: INLINE SocketStream(std::streambuf *buf); diff --git a/panda/src/downloader/stringStream.h b/panda/src/downloader/stringStream.h index b5b835ed17..a91dd0eea5 100644 --- a/panda/src/downloader/stringStream.h +++ b/panda/src/downloader/stringStream.h @@ -24,7 +24,7 @@ * buffer, which can be retrieved and/or set as a string in Python 2 or a * bytes object in Python 3. */ -class EXPCL_PANDAEXPRESS StringStream : public std::iostream { +class EXPCL_PANDA_DOWNLOADER StringStream : public std::iostream { public: INLINE StringStream(const std::string &source); diff --git a/panda/src/downloader/stringStreamBuf.h b/panda/src/downloader/stringStreamBuf.h index 64df6ba99b..333e945197 100644 --- a/panda/src/downloader/stringStreamBuf.h +++ b/panda/src/downloader/stringStreamBuf.h @@ -22,7 +22,7 @@ * to a memory buffer, whose contents can be appended to or extracted at any * time by application code. */ -class EXPCL_PANDAEXPRESS StringStreamBuf : public std::streambuf { +class EXPCL_PANDA_DOWNLOADER StringStreamBuf : public std::streambuf { public: StringStreamBuf(); virtual ~StringStreamBuf(); diff --git a/panda/src/downloader/urlSpec.h b/panda/src/downloader/urlSpec.h index 7477f4d6cd..df5a7b9bb6 100644 --- a/panda/src/downloader/urlSpec.h +++ b/panda/src/downloader/urlSpec.h @@ -25,7 +25,7 @@ class Filename; * The URLSpec object is similar to a Filename in that it contains logic to * identify the various parts of a URL and return (or modify) them separately. */ -class EXPCL_PANDAEXPRESS URLSpec { +class EXPCL_PANDA_DOWNLOADER URLSpec { PUBLISHED: URLSpec(); INLINE URLSpec(const std::string &url, bool server_name_expected = false); diff --git a/panda/src/downloader/virtualFileHTTP.h b/panda/src/downloader/virtualFileHTTP.h index a440bf7452..eaf63f0465 100644 --- a/panda/src/downloader/virtualFileHTTP.h +++ b/panda/src/downloader/virtualFileHTTP.h @@ -29,7 +29,7 @@ class VirtualFileMountHTTP; * VirtualFileSystem, allowing models etc. to be loaded directly from a web * page. */ -class EXPCL_PANDAEXPRESS VirtualFileHTTP : public VirtualFile { +class EXPCL_PANDA_DOWNLOADER VirtualFileHTTP : public VirtualFile { public: VirtualFileHTTP(VirtualFileMountHTTP *mount, const Filename &local_filename, diff --git a/panda/src/downloader/virtualFileMountHTTP.h b/panda/src/downloader/virtualFileMountHTTP.h index 4724ad5175..265e785c40 100644 --- a/panda/src/downloader/virtualFileMountHTTP.h +++ b/panda/src/downloader/virtualFileMountHTTP.h @@ -28,7 +28,7 @@ /** * Maps a web page (URL root) into the VirtualFileSystem. */ -class EXPCL_PANDAEXPRESS VirtualFileMountHTTP : public VirtualFileMount { +class EXPCL_PANDA_DOWNLOADER VirtualFileMountHTTP : public VirtualFileMount { PUBLISHED: explicit VirtualFileMountHTTP(const URLSpec &root, HTTPClient *http = HTTPClient::get_global_ptr()); virtual ~VirtualFileMountHTTP(); diff --git a/panda/src/express/buffer.h b/panda/src/express/buffer.h index 255125b21b..74f0f8d2b5 100644 --- a/panda/src/express/buffer.h +++ b/panda/src/express/buffer.h @@ -21,7 +21,7 @@ /** * */ -class EXPCL_PANDAEXPRESS Buffer : public ReferenceCount { +class EXPCL_PANDA_EXPRESS Buffer : public ReferenceCount { public: Buffer(int size); ~Buffer(); diff --git a/panda/src/express/checksumHashGenerator.h b/panda/src/express/checksumHashGenerator.h index c809230565..0a7ae11000 100644 --- a/panda/src/express/checksumHashGenerator.h +++ b/panda/src/express/checksumHashGenerator.h @@ -22,7 +22,7 @@ * This is a specific kind of HashGenerator that simply adds up all of the * ints. Nothing fancy, and pretty quick. */ -class EXPCL_PANDAEXPRESS ChecksumHashGenerator : public HashGeneratorBase { +class EXPCL_PANDA_EXPRESS ChecksumHashGenerator : public HashGeneratorBase { public: INLINE void add_int(long num); INLINE void add_bool(bool flag); diff --git a/panda/src/express/compress_string.cxx b/panda/src/express/compress_string.cxx index 2959d5d1a6..4d1069e34c 100644 --- a/panda/src/express/compress_string.cxx +++ b/panda/src/express/compress_string.cxx @@ -64,7 +64,7 @@ decompress_string(const string &source) { * results are written to the dest file, overwriting its contents. The return * value is bool on success, or false on failure. */ -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool compress_file(const Filename &source, const Filename &dest, int compression_level) { VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); Filename source_filename = source; @@ -101,7 +101,7 @@ compress_file(const Filename &source, const Filename &dest, int compression_leve * Note that a decompression error cannot easily be detected, and the output * may simply be a garbage or truncated string. */ -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decompress_file(const Filename &source, const Filename &dest) { Filename source_filename = Filename::binary_filename(source); VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); diff --git a/panda/src/express/compress_string.h b/panda/src/express/compress_string.h index 3fdbc4b258..7513dbaddd 100644 --- a/panda/src/express/compress_string.h +++ b/panda/src/express/compress_string.h @@ -22,20 +22,20 @@ BEGIN_PUBLISH -EXPCL_PANDAEXPRESS std::string +EXPCL_PANDA_EXPRESS std::string compress_string(const std::string &source, int compression_level); -EXPCL_PANDAEXPRESS std::string +EXPCL_PANDA_EXPRESS std::string decompress_string(const std::string &source); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool compress_file(const Filename &source, const Filename &dest, int compression_level); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decompress_file(const Filename &source, const Filename &dest); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool compress_stream(std::istream &source, std::ostream &dest, int compression_level); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decompress_stream(std::istream &source, std::ostream &dest); END_PUBLISH diff --git a/panda/src/express/config_express.cxx b/panda/src/express/config_express.cxx index ee38f6cd69..3a4343ac32 100644 --- a/panda/src/express/config_express.cxx +++ b/panda/src/express/config_express.cxx @@ -36,8 +36,8 @@ #include "dconfig.h" #include "streamWrapper.h" -#if !defined(CPPPARSER) && !defined(BUILDING_PANDAEXPRESS) - #error Buildsystem error: BUILDING_PANDAEXPRESS not defined +#if !defined(CPPPARSER) && !defined(BUILDING_PANDA_EXPRESS) + #error Buildsystem error: BUILDING_PANDA_EXPRESS not defined #endif ConfigureDef(config_express); diff --git a/panda/src/express/config_express.h b/panda/src/express/config_express.h index eabe20f834..13719ad8a3 100644 --- a/panda/src/express/config_express.h +++ b/panda/src/express/config_express.h @@ -28,20 +28,20 @@ #include "executionEnvironment.h" #include "lineStream.h" -ConfigureDecl(config_express, EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS); -NotifyCategoryDecl(express, EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS); -NotifyCategoryDecl(clock, EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS); +ConfigureDecl(config_express, EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS); +NotifyCategoryDecl(express, EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS); +NotifyCategoryDecl(clock, EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS); // Actually, we can't determine this config variable the normal way, because // we must be able to access it at static init time. Instead of declaring it // a global constant, we'll make it a member of MemoryUsage. -// extern EXPCL_PANDAEXPRESS const bool track_memory_usage; +// extern EXPCL_PANDA_EXPRESS const bool track_memory_usage; -EXPCL_PANDAEXPRESS bool get_use_high_res_clock(); -EXPCL_PANDAEXPRESS bool get_paranoid_clock(); -EXPCL_PANDAEXPRESS bool get_paranoid_inheritance(); -EXPCL_PANDAEXPRESS bool get_verify_dcast(); +EXPCL_PANDA_EXPRESS bool get_use_high_res_clock(); +EXPCL_PANDA_EXPRESS bool get_paranoid_clock(); +EXPCL_PANDA_EXPRESS bool get_paranoid_inheritance(); +EXPCL_PANDA_EXPRESS bool get_verify_dcast(); extern ConfigVariableInt patchfile_window_size; extern ConfigVariableInt patchfile_increment_size; @@ -51,14 +51,14 @@ extern ConfigVariableInt patchfile_zone_size; extern ConfigVariableBool keep_temporary_files; extern ConfigVariableBool multifile_always_binary; -extern EXPCL_PANDAEXPRESS ConfigVariableBool collect_tcp; -extern EXPCL_PANDAEXPRESS ConfigVariableDouble collect_tcp_interval; +extern EXPCL_PANDA_EXPRESS ConfigVariableBool collect_tcp; +extern EXPCL_PANDA_EXPRESS ConfigVariableDouble collect_tcp_interval; // Expose the Config variable for Python access. BEGIN_PUBLISH -EXPCL_PANDAEXPRESS DConfig &get_config_express(); +EXPCL_PANDA_EXPRESS DConfig &get_config_express(); END_PUBLISH -extern EXPCL_PANDAEXPRESS void init_libexpress(); +extern EXPCL_PANDA_EXPRESS void init_libexpress(); #endif /* __CONFIG_UTIL_H__ */ diff --git a/panda/src/express/copy_stream.h b/panda/src/express/copy_stream.h index d93e00fa69..0260c662b0 100644 --- a/panda/src/express/copy_stream.h +++ b/panda/src/express/copy_stream.h @@ -17,7 +17,7 @@ #include "pandabase.h" BEGIN_PUBLISH -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool copy_stream(std::istream &source, std::ostream &dest); END_PUBLISH diff --git a/panda/src/express/datagram.h b/panda/src/express/datagram.h index a865c6bec6..69dce69e31 100644 --- a/panda/src/express/datagram.h +++ b/panda/src/express/datagram.h @@ -35,7 +35,7 @@ * A Datagram is itself headerless; it is simply a collection of data * elements. */ -class EXPCL_PANDAEXPRESS Datagram : public TypedObject { +class EXPCL_PANDA_EXPRESS Datagram : public TypedObject { PUBLISHED: INLINE Datagram(); INLINE Datagram(const void *data, size_t size); diff --git a/panda/src/express/datagramGenerator.h b/panda/src/express/datagramGenerator.h index 621cb73517..2c68c0199d 100644 --- a/panda/src/express/datagramGenerator.h +++ b/panda/src/express/datagramGenerator.h @@ -27,7 +27,7 @@ class VirtualFile; * This class defines the abstract interace to any source of datagrams, * whether it be from a file or from the net. */ -class EXPCL_PANDAEXPRESS DatagramGenerator { +class EXPCL_PANDA_EXPRESS DatagramGenerator { PUBLISHED: INLINE DatagramGenerator(); virtual ~DatagramGenerator(); diff --git a/panda/src/express/datagramIterator.h b/panda/src/express/datagramIterator.h index 60a893f477..570e34c3c4 100644 --- a/panda/src/express/datagramIterator.h +++ b/panda/src/express/datagramIterator.h @@ -24,7 +24,7 @@ * Datagram. Elements may be retrieved one at a time; it is up to the caller * to know the correct type and order of each element. */ -class EXPCL_PANDAEXPRESS DatagramIterator { +class EXPCL_PANDA_EXPRESS DatagramIterator { public: INLINE void assign(Datagram &datagram, size_t offset = 0); diff --git a/panda/src/express/datagramSink.h b/panda/src/express/datagramSink.h index 04d19dfaec..697b6a166f 100644 --- a/panda/src/express/datagramSink.h +++ b/panda/src/express/datagramSink.h @@ -26,7 +26,7 @@ class Filename; * This class defines the abstract interface to sending datagrams to any * target, whether it be into a file or across the net */ -class EXPCL_PANDAEXPRESS DatagramSink { +class EXPCL_PANDA_EXPRESS DatagramSink { PUBLISHED: INLINE DatagramSink(); virtual ~DatagramSink(); diff --git a/panda/src/express/dcast.h b/panda/src/express/dcast.h index 32ea9e4238..a234f2bbc7 100644 --- a/panda/src/express/dcast.h +++ b/panda/src/express/dcast.h @@ -64,7 +64,7 @@ INLINE const WantType *_dcast_ref(WantType *&, const TypedObject *ptr); #ifdef DO_DCAST // _dcast_verify performs the actual verification. -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool _dcast_verify(TypeHandle want_handle, size_t want_size, const TypedObject *ptr); #endif // DO_DCAST diff --git a/panda/src/express/encrypt_string.cxx b/panda/src/express/encrypt_string.cxx index db72921aa8..be2100cee8 100644 --- a/panda/src/express/encrypt_string.cxx +++ b/panda/src/express/encrypt_string.cxx @@ -75,7 +75,7 @@ decrypt_string(const string &source, const string &password) { * to the dest file, overwriting its contents. The return value is bool on * success, or false on failure. */ -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool encrypt_file(const Filename &source, const Filename &dest, const string &password, const string &algorithm, int key_length, int iteration_count) { VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); @@ -115,7 +115,7 @@ encrypt_file(const Filename &source, const Filename &dest, const string &passwor * Note that a decryption error, including an incorrect password, cannot * easily be detected, and the output may simply be a garbage string. */ -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decrypt_file(const Filename &source, const Filename &dest, const string &password) { Filename source_filename = Filename::binary_filename(source); VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); diff --git a/panda/src/express/encrypt_string.h b/panda/src/express/encrypt_string.h index 317c9231c8..7b247baefe 100644 --- a/panda/src/express/encrypt_string.h +++ b/panda/src/express/encrypt_string.h @@ -22,25 +22,25 @@ BEGIN_PUBLISH -EXPCL_PANDAEXPRESS std::string +EXPCL_PANDA_EXPRESS std::string encrypt_string(const std::string &source, const std::string &password, const std::string &algorithm = std::string(), int key_length = -1, int iteration_count = -1); -EXPCL_PANDAEXPRESS std::string +EXPCL_PANDA_EXPRESS std::string decrypt_string(const std::string &source, const std::string &password); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool encrypt_file(const Filename &source, const Filename &dest, const std::string &password, const std::string &algorithm = std::string(), int key_length = -1, int iteration_count = -1); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decrypt_file(const Filename &source, const Filename &dest, const std::string &password); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool encrypt_stream(std::istream &source, std::ostream &dest, const std::string &password, const std::string &algorithm = std::string(), int key_length = -1, int iteration_count = -1); -EXPCL_PANDAEXPRESS bool +EXPCL_PANDA_EXPRESS bool decrypt_stream(std::istream &source, std::ostream &dest, const std::string &password); END_PUBLISH diff --git a/panda/src/express/error_utils.h b/panda/src/express/error_utils.h index 161a2482fe..0d4f22cd3f 100644 --- a/panda/src/express/error_utils.h +++ b/panda/src/express/error_utils.h @@ -74,12 +74,12 @@ enum ErrorUtilCode { EU_error_zlib = -80, }; -EXPCL_PANDAEXPRESS std::string error_to_text(ErrorUtilCode err); -EXPCL_PANDAEXPRESS int get_write_error(); +EXPCL_PANDA_EXPRESS std::string error_to_text(ErrorUtilCode err); +EXPCL_PANDA_EXPRESS int get_write_error(); #ifdef HAVE_NET -EXPCL_PANDAEXPRESS std::string handle_socket_error(); -EXPCL_PANDAEXPRESS int get_network_error(); +EXPCL_PANDA_EXPRESS std::string handle_socket_error(); +EXPCL_PANDA_EXPRESS int get_network_error(); #endif END_PUBLISH diff --git a/panda/src/express/fileReference.h b/panda/src/express/fileReference.h index b870121016..d874f26e11 100644 --- a/panda/src/express/fileReference.h +++ b/panda/src/express/fileReference.h @@ -23,7 +23,7 @@ * Keeps a reference-counted pointer to a file on disk. As long as the * FileReference is held, someone presumably has a use for this file. */ -class EXPCL_PANDAEXPRESS FileReference : public TypedReferenceCount { +class EXPCL_PANDA_EXPRESS FileReference : public TypedReferenceCount { PUBLISHED: INLINE FileReference(const Filename &filename); INLINE const Filename &get_filename() const; diff --git a/panda/src/express/hashGeneratorBase.h b/panda/src/express/hashGeneratorBase.h index 86145a74df..d843adb151 100644 --- a/panda/src/express/hashGeneratorBase.h +++ b/panda/src/express/hashGeneratorBase.h @@ -27,7 +27,7 @@ * Thus, a compile-time decision must be made for the kind of HashGenerator * that is appropriate for a particular class. */ -class EXPCL_PANDAEXPRESS HashGeneratorBase { +class EXPCL_PANDA_EXPRESS HashGeneratorBase { public: INLINE HashGeneratorBase(); diff --git a/panda/src/express/hashVal.h b/panda/src/express/hashVal.h index eebff3eaff..2067053a9f 100644 --- a/panda/src/express/hashVal.h +++ b/panda/src/express/hashVal.h @@ -27,7 +27,7 @@ * Stores a 128-bit value that represents the hashed contents (typically MD5) * of a file or buffer. */ -class EXPCL_PANDAEXPRESS HashVal { +class EXPCL_PANDA_EXPRESS HashVal { PUBLISHED: INLINE HashVal(); INLINE HashVal(const HashVal ©); diff --git a/panda/src/express/memoryUsage.h b/panda/src/express/memoryUsage.h index 4e33ef3766..0371877ee0 100644 --- a/panda/src/express/memoryUsage.h +++ b/panda/src/express/memoryUsage.h @@ -32,7 +32,7 @@ class MemoryUsagePointers; * When compiled with NDEBUG set, this entire class does nothing and compiles * to a stub. */ -class EXPCL_PANDAEXPRESS MemoryUsage : public MemoryHook { +class EXPCL_PANDA_EXPRESS MemoryUsage : public MemoryHook { public: ALWAYS_INLINE static bool get_track_memory_usage(); diff --git a/panda/src/express/memoryUsagePointers.h b/panda/src/express/memoryUsagePointers.h index 526efec7c8..30063cf925 100644 --- a/panda/src/express/memoryUsagePointers.h +++ b/panda/src/express/memoryUsagePointers.h @@ -35,7 +35,7 @@ * This class is just a user interface to talk about pointers stored in a * MemoryUsage object. It doesn't even exist when compiled with NDEBUG. */ -class EXPCL_PANDAEXPRESS MemoryUsagePointers { +class EXPCL_PANDA_EXPRESS MemoryUsagePointers { PUBLISHED: MemoryUsagePointers(); ~MemoryUsagePointers(); diff --git a/panda/src/express/multifile.h b/panda/src/express/multifile.h index 5ea0ce46e4..49aac3cf82 100644 --- a/panda/src/express/multifile.h +++ b/panda/src/express/multifile.h @@ -34,7 +34,7 @@ typedef struct evp_pkey_st EVP_PKEY; /** * A file that contains a set of files. */ -class EXPCL_PANDAEXPRESS Multifile : public ReferenceCount { +class EXPCL_PANDA_EXPRESS Multifile : public ReferenceCount { PUBLISHED: Multifile(); Multifile(const Multifile ©) = delete; diff --git a/panda/src/express/namable.h b/panda/src/express/namable.h index 7dc42d089b..eb8c0c6e79 100644 --- a/panda/src/express/namable.h +++ b/panda/src/express/namable.h @@ -23,7 +23,7 @@ * A base class for all things which can have a name. The name is either * empty or nonempty, but it is never NULL. */ -class EXPCL_PANDAEXPRESS Namable : public MemoryBase { +class EXPCL_PANDA_EXPRESS Namable : public MemoryBase { PUBLISHED: INLINE explicit Namable(const std::string &initial_name = ""); diff --git a/panda/src/express/nodeReferenceCount.h b/panda/src/express/nodeReferenceCount.h index 2312508f1b..0ece11b90a 100644 --- a/panda/src/express/nodeReferenceCount.h +++ b/panda/src/express/nodeReferenceCount.h @@ -30,7 +30,7 @@ * See also CachedTypedWritableReferenceCount, which is similar in principle, * as well as NodeCachedReferenceCount, which combines both of these. */ -class EXPCL_PANDAEXPRESS NodeReferenceCount : public ReferenceCount { +class EXPCL_PANDA_EXPRESS NodeReferenceCount : public ReferenceCount { protected: INLINE NodeReferenceCount(); INLINE NodeReferenceCount(const NodeReferenceCount ©); diff --git a/panda/src/express/openSSLWrapper.h b/panda/src/express/openSSLWrapper.h index 134bc28ccb..1be8eabb2f 100644 --- a/panda/src/express/openSSLWrapper.h +++ b/panda/src/express/openSSLWrapper.h @@ -43,7 +43,7 @@ * the library is properly initialized in the application, and to provide some * hooks into global OpenSSL context data. */ -class EXPCL_PANDAEXPRESS OpenSSLWrapper { +class EXPCL_PANDA_EXPRESS OpenSSLWrapper { private: OpenSSLWrapper(); ~OpenSSLWrapper(); diff --git a/panda/src/express/pStatCollectorForwardBase.h b/panda/src/express/pStatCollectorForwardBase.h index 79e53d8060..dcc2fa73da 100644 --- a/panda/src/express/pStatCollectorForwardBase.h +++ b/panda/src/express/pStatCollectorForwardBase.h @@ -25,7 +25,7 @@ * This is subclassed as PStatCollectorForward, which defines the actual * functionality. */ -class EXPCL_PANDAEXPRESS PStatCollectorForwardBase : public ReferenceCount { +class EXPCL_PANDA_EXPRESS PStatCollectorForwardBase : public ReferenceCount { PUBLISHED: #ifdef DO_PSTATS virtual ~PStatCollectorForwardBase(); diff --git a/panda/src/express/password_hash.h b/panda/src/express/password_hash.h index a1af7e8b26..f6091b8103 100644 --- a/panda/src/express/password_hash.h +++ b/panda/src/express/password_hash.h @@ -22,9 +22,9 @@ BEGIN_PUBLISH -EXPCL_PANDAEXPRESS std::string password_hash(const std::string &password, - const std::string &salt, - int iters, int keylen); +EXPCL_PANDA_EXPRESS std::string password_hash(const std::string &password, + const std::string &salt, + int iters, int keylen); END_PUBLISH diff --git a/panda/src/express/patchfile.h b/panda/src/express/patchfile.h index 6e40d65aee..d052ef8386 100644 --- a/panda/src/express/patchfile.h +++ b/panda/src/express/patchfile.h @@ -36,7 +36,7 @@ /** * */ -class EXPCL_PANDAEXPRESS Patchfile { +class EXPCL_PANDA_EXPRESS Patchfile { PUBLISHED: Patchfile(); explicit Patchfile(PT(Buffer) buffer); diff --git a/panda/src/express/pointerToArrayBase.cxx b/panda/src/express/pointerToArrayBase.cxx index 0be7bbc08a..4faeda50bf 100644 --- a/panda/src/express/pointerToArrayBase.cxx +++ b/panda/src/express/pointerToArrayBase.cxx @@ -13,4 +13,4 @@ #include "pointerToArrayBase.h" -EXPCL_PANDAEXPRESS PTASetLevelFunc *pta_set_level = nullptr; +EXPCL_PANDA_EXPRESS PTASetLevelFunc *pta_set_level = nullptr; diff --git a/panda/src/express/pointerToVoid.h b/panda/src/express/pointerToVoid.h index aca9ba15e7..1f5fadd492 100644 --- a/panda/src/express/pointerToVoid.h +++ b/panda/src/express/pointerToVoid.h @@ -30,7 +30,7 @@ * * This is the base class for PointerToBase. */ -class EXPCL_PANDAEXPRESS PointerToVoid : public MemoryBase { +class EXPCL_PANDA_EXPRESS PointerToVoid : public MemoryBase { protected: constexpr PointerToVoid() noexcept; //INLINE ~PointerToVoid(); diff --git a/panda/src/express/profileTimer.cxx b/panda/src/express/profileTimer.cxx index e21b41da59..78df0afbd4 100644 --- a/panda/src/express/profileTimer.cxx +++ b/panda/src/express/profileTimer.cxx @@ -16,7 +16,7 @@ // See ProfileTimer.h for documentation. -EXPCL_PANDAEXPRESS ProfileTimer Skyler_timer_global=ProfileTimer("startup"); +EXPCL_PANDA_EXPRESS ProfileTimer Skyler_timer_global=ProfileTimer("startup"); ProfileTimer* ProfileTimer::_head; diff --git a/panda/src/express/profileTimer.h b/panda/src/express/profileTimer.h index 6a2daae21a..39ab65c588 100644 --- a/panda/src/express/profileTimer.h +++ b/panda/src/express/profileTimer.h @@ -37,7 +37,7 @@ seconds of each other, I don't think you'll get very good results. */ -class EXPCL_PANDAEXPRESS ProfileTimer { +class EXPCL_PANDA_EXPRESS ProfileTimer { enum { MaxEntriesDefault=4096 }; PUBLISHED: explicit ProfileTimer(const char* name=0, int maxEntries=MaxEntriesDefault); @@ -67,7 +67,7 @@ public: ... } */ - class EXPCL_PANDAEXPRESS AutoTimer { + class EXPCL_PANDA_EXPRESS AutoTimer { public: AutoTimer(ProfileTimer& profile, const char* tag); ~AutoTimer(); diff --git a/panda/src/express/pta_double.h b/panda/src/express/pta_double.h index 4db51677eb..0edd1c4b89 100644 --- a/panda/src/express/pta_double.h +++ b/panda/src/express/pta_double.h @@ -26,10 +26,10 @@ * defining the pta again. */ -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, ConstPointerToArray) typedef PointerToArray PTA_double; typedef ConstPointerToArray CPTA_double; diff --git a/panda/src/express/pta_float.h b/panda/src/express/pta_float.h index fd84774654..2f3b32efb4 100644 --- a/panda/src/express/pta_float.h +++ b/panda/src/express/pta_float.h @@ -26,10 +26,10 @@ * defining the pta again. */ -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, ConstPointerToArray) typedef PointerToArray PTA_float; typedef ConstPointerToArray CPTA_float; diff --git a/panda/src/express/pta_int.h b/panda/src/express/pta_int.h index 93ed0bb900..fda34e3fde 100644 --- a/panda/src/express/pta_int.h +++ b/panda/src/express/pta_int.h @@ -26,10 +26,10 @@ * pta again. */ -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, ConstPointerToArray) typedef PointerToArray PTA_int; typedef ConstPointerToArray CPTA_int; diff --git a/panda/src/express/pta_uchar.h b/panda/src/express/pta_uchar.h index 1552c6bcab..860e877042 100644 --- a/panda/src/express/pta_uchar.h +++ b/panda/src/express/pta_uchar.h @@ -21,7 +21,7 @@ /** * A pta of uchars. This class is defined once here, and exported to - * PANDAEXPRESS.DLL; other packages that want to use a pta of this type + * PANDA_EXPRESS.DLL; other packages that want to use a pta of this type * (whether they need to export it or not) should include this header file, * rather than defining the pta again. */ @@ -29,10 +29,10 @@ #if !defined(__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7 // GCC 4.6 has a weird bug related to this type. #else -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EXPRESS, EXPTP_PANDA_EXPRESS, ConstPointerToArray) #endif typedef PointerToArray PTA_uchar; diff --git a/panda/src/express/ramfile.h b/panda/src/express/ramfile.h index 0d7c031fcc..b115383aa0 100644 --- a/panda/src/express/ramfile.h +++ b/panda/src/express/ramfile.h @@ -22,7 +22,7 @@ /** * An in-memory buffer specifically designed for downloading files to memory. */ -class EXPCL_PANDAEXPRESS Ramfile { +class EXPCL_PANDA_EXPRESS Ramfile { PUBLISHED: INLINE Ramfile(); diff --git a/panda/src/express/referenceCount.h b/panda/src/express/referenceCount.h index ba27ac7db8..46f0231117 100644 --- a/panda/src/express/referenceCount.h +++ b/panda/src/express/referenceCount.h @@ -35,7 +35,7 @@ * ReferenceCount works in conjunction with PointerTo to automatically delete * objects when the last pointer to them goes away. */ -class EXPCL_PANDAEXPRESS ReferenceCount : public MemoryBase { +class EXPCL_PANDA_EXPRESS ReferenceCount : public MemoryBase { protected: INLINE ReferenceCount(); INLINE ReferenceCount(const ReferenceCount &); diff --git a/panda/src/express/subStream.h b/panda/src/express/subStream.h index 84d8a8a460..82bf222e2f 100644 --- a/panda/src/express/subStream.h +++ b/panda/src/express/subStream.h @@ -27,7 +27,7 @@ * The source stream must be one that we can randomly seek within. The * resulting ISubStream will also support arbitrary seeks. */ -class EXPCL_PANDAEXPRESS ISubStream : public std::istream { +class EXPCL_PANDA_EXPRESS ISubStream : public std::istream { PUBLISHED: INLINE ISubStream(); INLINE explicit ISubStream(IStreamWrapper *source, std::streampos start, std::streampos end); @@ -52,7 +52,7 @@ private: * The dest stream must be one that we can randomly seek within. The * resulting OSubStream will also support arbitrary seeks. */ -class EXPCL_PANDAEXPRESS OSubStream : public std::ostream { +class EXPCL_PANDA_EXPRESS OSubStream : public std::ostream { PUBLISHED: INLINE OSubStream(); INLINE explicit OSubStream(OStreamWrapper *dest, std::streampos start, std::streampos end, bool append = false); @@ -71,7 +71,7 @@ private: /** * Combined ISubStream and OSubStream for bidirectional I/O. */ -class EXPCL_PANDAEXPRESS SubStream : public std::iostream { +class EXPCL_PANDA_EXPRESS SubStream : public std::iostream { PUBLISHED: INLINE SubStream(); INLINE explicit SubStream(StreamWrapper *nested, std::streampos start, std::streampos end, bool append = false); diff --git a/panda/src/express/subStreamBuf.h b/panda/src/express/subStreamBuf.h index 260f849098..779f43d94c 100644 --- a/panda/src/express/subStreamBuf.h +++ b/panda/src/express/subStreamBuf.h @@ -20,7 +20,7 @@ /** * The streambuf object that implements ISubStream. */ -class EXPCL_PANDAEXPRESS SubStreamBuf : public std::streambuf { +class EXPCL_PANDA_EXPRESS SubStreamBuf : public std::streambuf { public: SubStreamBuf(); virtual ~SubStreamBuf(); diff --git a/panda/src/express/subfileInfo.h b/panda/src/express/subfileInfo.h index 7faa59c1e6..133c557ad1 100644 --- a/panda/src/express/subfileInfo.h +++ b/panda/src/express/subfileInfo.h @@ -23,7 +23,7 @@ * disk. Generally, the filename is understood as a physical file on disk, * and not to be looked up via the vfs. */ -class EXPCL_PANDAEXPRESS SubfileInfo { +class EXPCL_PANDA_EXPRESS SubfileInfo { PUBLISHED: INLINE SubfileInfo(); INLINE explicit SubfileInfo(const FileReference *file, std::streampos start, std::streamsize size); diff --git a/panda/src/express/temporaryFile.h b/panda/src/express/temporaryFile.h index 8bc66da12b..a8537430e9 100644 --- a/panda/src/express/temporaryFile.h +++ b/panda/src/express/temporaryFile.h @@ -23,7 +23,7 @@ * the file in question when it is deleted. It is not responsible for * creating, opening, or closing the file, however. */ -class EXPCL_PANDAEXPRESS TemporaryFile : public FileReference { +class EXPCL_PANDA_EXPRESS TemporaryFile : public FileReference { PUBLISHED: INLINE explicit TemporaryFile(const Filename &filename); virtual ~TemporaryFile(); diff --git a/panda/src/express/trueClock.h b/panda/src/express/trueClock.h index 45ab097e8b..b6255f211a 100644 --- a/panda/src/express/trueClock.h +++ b/panda/src/express/trueClock.h @@ -30,7 +30,7 @@ * zero, this value can only be meaningfully used to measure elapsed time, by * sampling it at two different times and subtracting. */ -class EXPCL_PANDAEXPRESS TrueClock { +class EXPCL_PANDA_EXPRESS TrueClock { PUBLISHED: // get_long_time() returns the most accurate timer we have over a long // interval. It may not be very precise for measuring short intervals, but diff --git a/panda/src/express/typedReferenceCount.h b/panda/src/express/typedReferenceCount.h index 3f2daaab61..77cc5c3866 100644 --- a/panda/src/express/typedReferenceCount.h +++ b/panda/src/express/typedReferenceCount.h @@ -28,7 +28,7 @@ * * See also TypedObject for detailed instructions. */ -class EXPCL_PANDAEXPRESS TypedReferenceCount : public TypedObject, public ReferenceCount { +class EXPCL_PANDA_EXPRESS TypedReferenceCount : public TypedObject, public ReferenceCount { public: INLINE TypedReferenceCount(); INLINE TypedReferenceCount(const TypedReferenceCount ©); diff --git a/panda/src/express/virtualFile.h b/panda/src/express/virtualFile.h index 6bab505a43..0763bc5e18 100644 --- a/panda/src/express/virtualFile.h +++ b/panda/src/express/virtualFile.h @@ -32,7 +32,7 @@ class VirtualFileSystem; * The abstract base class for a file or directory within the * VirtualFileSystem. */ -class EXPCL_PANDAEXPRESS VirtualFile : public TypedReferenceCount { +class EXPCL_PANDA_EXPRESS VirtualFile : public TypedReferenceCount { public: INLINE VirtualFile(); diff --git a/panda/src/express/virtualFileComposite.h b/panda/src/express/virtualFileComposite.h index 3d76b96168..3e41e36fef 100644 --- a/panda/src/express/virtualFileComposite.h +++ b/panda/src/express/virtualFileComposite.h @@ -23,7 +23,7 @@ * one directory on different mount points. The resulting directory appears * to be the union of all the individual simple directories. */ -class EXPCL_PANDAEXPRESS VirtualFileComposite : public VirtualFile { +class EXPCL_PANDA_EXPRESS VirtualFileComposite : public VirtualFile { public: INLINE VirtualFileComposite(VirtualFileSystem *file_system, const Filename &filename); diff --git a/panda/src/express/virtualFileList.h b/panda/src/express/virtualFileList.h index 6f01172a7a..4f900d6a50 100644 --- a/panda/src/express/virtualFileList.h +++ b/panda/src/express/virtualFileList.h @@ -22,7 +22,7 @@ /** * A list of VirtualFiles, as returned by VirtualFile::scan_directory(). */ -class EXPCL_PANDAEXPRESS VirtualFileList : public ReferenceCount { +class EXPCL_PANDA_EXPRESS VirtualFileList : public ReferenceCount { public: INLINE VirtualFileList(); diff --git a/panda/src/express/virtualFileMount.h b/panda/src/express/virtualFileMount.h index f192b268ce..720139b78e 100644 --- a/panda/src/express/virtualFileMount.h +++ b/panda/src/express/virtualFileMount.h @@ -28,7 +28,7 @@ class VirtualFileSystem; * VirtualFileSystem. Normally users don't need to monkey with this class * directly. */ -class EXPCL_PANDAEXPRESS VirtualFileMount : public TypedReferenceCount { +class EXPCL_PANDA_EXPRESS VirtualFileMount : public TypedReferenceCount { PUBLISHED: INLINE VirtualFileMount(); virtual ~VirtualFileMount(); diff --git a/panda/src/express/virtualFileMountAndroidAsset.h b/panda/src/express/virtualFileMountAndroidAsset.h index 650180f7eb..3c87ac4fb7 100644 --- a/panda/src/express/virtualFileMountAndroidAsset.h +++ b/panda/src/express/virtualFileMountAndroidAsset.h @@ -27,7 +27,7 @@ /** * Maps a Multifile's contents into the VirtualFileSystem. */ -class EXPCL_PANDAEXPRESS VirtualFileMountAndroidAsset : public VirtualFileMount { +class EXPCL_PANDA_EXPRESS VirtualFileMountAndroidAsset : public VirtualFileMount { PUBLISHED: INLINE VirtualFileMountAndroidAsset(AAssetManager *mgr, const std::string &apk_path); virtual ~VirtualFileMountAndroidAsset(); diff --git a/panda/src/express/virtualFileMountMultifile.h b/panda/src/express/virtualFileMountMultifile.h index 3676990042..97dd658d06 100644 --- a/panda/src/express/virtualFileMountMultifile.h +++ b/panda/src/express/virtualFileMountMultifile.h @@ -23,7 +23,7 @@ /** * Maps a Multifile's contents into the VirtualFileSystem. */ -class EXPCL_PANDAEXPRESS VirtualFileMountMultifile : public VirtualFileMount { +class EXPCL_PANDA_EXPRESS VirtualFileMountMultifile : public VirtualFileMount { PUBLISHED: INLINE VirtualFileMountMultifile(Multifile *multifile); virtual ~VirtualFileMountMultifile(); diff --git a/panda/src/express/virtualFileMountRamdisk.h b/panda/src/express/virtualFileMountRamdisk.h index 0175f2682c..ae87105473 100644 --- a/panda/src/express/virtualFileMountRamdisk.h +++ b/panda/src/express/virtualFileMountRamdisk.h @@ -27,7 +27,7 @@ * limits to the size of the files that may be written with this system; and * "files" written here are not automatically persistent between sessions. */ -class EXPCL_PANDAEXPRESS VirtualFileMountRamdisk : public VirtualFileMount { +class EXPCL_PANDA_EXPRESS VirtualFileMountRamdisk : public VirtualFileMount { PUBLISHED: VirtualFileMountRamdisk(); diff --git a/panda/src/express/virtualFileMountSystem.h b/panda/src/express/virtualFileMountSystem.h index 69761b1df7..f812b53365 100644 --- a/panda/src/express/virtualFileMountSystem.h +++ b/panda/src/express/virtualFileMountSystem.h @@ -21,7 +21,7 @@ /** * Maps an actual OS directory into the VirtualFileSystem. */ -class EXPCL_PANDAEXPRESS VirtualFileMountSystem : public VirtualFileMount { +class EXPCL_PANDA_EXPRESS VirtualFileMountSystem : public VirtualFileMount { PUBLISHED: INLINE VirtualFileMountSystem(const Filename &physical_filename); diff --git a/panda/src/express/virtualFileSimple.h b/panda/src/express/virtualFileSimple.h index 671d435f44..70811f1ae5 100644 --- a/panda/src/express/virtualFileSimple.h +++ b/panda/src/express/virtualFileSimple.h @@ -23,7 +23,7 @@ * exactly one file on one mount point. Most directories, and all regular * files, are of this kind. */ -class EXPCL_PANDAEXPRESS VirtualFileSimple : public VirtualFile { +class EXPCL_PANDA_EXPRESS VirtualFileSimple : public VirtualFile { public: INLINE VirtualFileSimple(VirtualFileMount *mount, const Filename &local_filename, diff --git a/panda/src/express/virtualFileSystem.h b/panda/src/express/virtualFileSystem.h index 7da00d4249..8113946524 100644 --- a/panda/src/express/virtualFileSystem.h +++ b/panda/src/express/virtualFileSystem.h @@ -37,7 +37,7 @@ class VirtualFileComposite; * For instance, a VirtualFileSystem can transparently mount one or more * Multifiles as their own subdirectory hierarchies. */ -class EXPCL_PANDAEXPRESS VirtualFileSystem { +class EXPCL_PANDA_EXPRESS VirtualFileSystem { PUBLISHED: VirtualFileSystem(); ~VirtualFileSystem(); diff --git a/panda/src/express/weakPointerCallback.h b/panda/src/express/weakPointerCallback.h index 37b4ed2b9c..e3d300bcb3 100644 --- a/panda/src/express/weakPointerCallback.h +++ b/panda/src/express/weakPointerCallback.h @@ -21,7 +21,7 @@ * get an immediate callback from a WeakPointerTo object when its referenced * pointer is deleted. */ -class EXPCL_PANDAEXPRESS WeakPointerCallback { +class EXPCL_PANDA_EXPRESS WeakPointerCallback { public: virtual ~WeakPointerCallback(); virtual void wp_callback(void *pointer)=0; diff --git a/panda/src/express/weakPointerToVoid.h b/panda/src/express/weakPointerToVoid.h index 5b130463e6..56ace2dcb2 100644 --- a/panda/src/express/weakPointerToVoid.h +++ b/panda/src/express/weakPointerToVoid.h @@ -23,7 +23,7 @@ * This is the specialization of PointerToVoid for weak pointers. It needs an * additional flag to indicate that the pointer has been deleted. */ -class EXPCL_PANDAEXPRESS WeakPointerToVoid : public PointerToVoid { +class EXPCL_PANDA_EXPRESS WeakPointerToVoid : public PointerToVoid { protected: INLINE WeakPointerToVoid(); diff --git a/panda/src/express/weakReferenceList.h b/panda/src/express/weakReferenceList.h index 49f352c103..30ab68edae 100644 --- a/panda/src/express/weakReferenceList.h +++ b/panda/src/express/weakReferenceList.h @@ -26,7 +26,7 @@ class WeakPointerCallback; * object is created, and can outlive the object until all weak references * have disappeared. */ -class EXPCL_PANDAEXPRESS WeakReferenceList { +class EXPCL_PANDA_EXPRESS WeakReferenceList { public: WeakReferenceList(); ~WeakReferenceList(); diff --git a/panda/src/express/windowsRegistry.h b/panda/src/express/windowsRegistry.h index 215b8217c8..c402eed2ab 100644 --- a/panda/src/express/windowsRegistry.h +++ b/panda/src/express/windowsRegistry.h @@ -25,7 +25,7 @@ * encoding and stores them in Unicode (and conversely reconverts them on * retrieval). */ -class EXPCL_PANDAEXPRESS WindowsRegistry +class EXPCL_PANDA_EXPRESS WindowsRegistry { PUBLISHED: enum RegLevel { diff --git a/panda/src/express/zStream.h b/panda/src/express/zStream.h index 08c1301c9b..b05a75158c 100644 --- a/panda/src/express/zStream.h +++ b/panda/src/express/zStream.h @@ -31,7 +31,7 @@ * * Seeking is not supported. */ -class EXPCL_PANDAEXPRESS IDecompressStream : public std::istream { +class EXPCL_PANDA_EXPRESS IDecompressStream : public std::istream { PUBLISHED: INLINE IDecompressStream(); INLINE explicit IDecompressStream(std::istream *source, bool owns_source); @@ -57,7 +57,7 @@ private: * * Seeking is not supported. */ -class EXPCL_PANDAEXPRESS OCompressStream : public std::ostream { +class EXPCL_PANDA_EXPRESS OCompressStream : public std::ostream { PUBLISHED: INLINE OCompressStream(); INLINE explicit OCompressStream(std::ostream *dest, bool owns_dest, diff --git a/panda/src/express/zStreamBuf.h b/panda/src/express/zStreamBuf.h index e4cb77bf04..35446090db 100644 --- a/panda/src/express/zStreamBuf.h +++ b/panda/src/express/zStreamBuf.h @@ -24,7 +24,7 @@ /** * The streambuf object that implements IDecompressStream and OCompressStream. */ -class EXPCL_PANDAEXPRESS ZStreamBuf : public std::streambuf { +class EXPCL_PANDA_DOWNLOADER ZStreamBuf : public std::streambuf { public: ZStreamBuf(); virtual ~ZStreamBuf(); diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h index beca549740..a1b17ffb86 100644 --- a/panda/src/pandabase/pandasymbols.h +++ b/panda/src/pandabase/pandasymbols.h @@ -105,6 +105,12 @@ #define BUILDING_PANDA_TFORM #endif +/* BUILDING_PANDAEXPRESS for these: */ +#ifdef BUILDING_PANDAEXPRESS + #define BUILDING_PANDA_DOWNLOADER + #define BUILDING_PANDA_EXPRESS +#endif + #ifdef BUILDING_LIBPANDA #define EXPCL_LIBPANDA EXPORT_CLASS #define EXPTP_LIBPANDA EXPORT_TEMPL @@ -177,6 +183,14 @@ #define EXPTP_PANDA_DISPLAY IMPORT_TEMPL #endif +#ifdef BUILDING_PANDA_DOWNLOADER + #define EXPCL_PANDA_DOWNLOADER EXPORT_CLASS + #define EXPTP_PANDA_DOWNLOADER EXPORT_TEMPL +#else + #define EXPCL_PANDA_DOWNLOADER IMPORT_CLASS + #define EXPTP_PANDA_DOWNLOADER IMPORT_TEMPL +#endif + #ifdef BUILDING_PANDA_DXML #define EXPCL_PANDA_DXML EXPORT_CLASS #define EXPTP_PANDA_DXML EXPORT_TEMPL @@ -193,6 +207,14 @@ #define EXPTP_PANDA_EVENT IMPORT_TEMPL #endif +#ifdef BUILDING_PANDA_EXPRESS + #define EXPCL_PANDA_EXPRESS EXPORT_CLASS + #define EXPTP_PANDA_EXPRESS EXPORT_TEMPL +#else + #define EXPCL_PANDA_EXPRESS IMPORT_CLASS + #define EXPTP_PANDA_EXPRESS IMPORT_TEMPL +#endif + #ifdef BUILDING_PANDA_GOBJ #define EXPCL_PANDA_GOBJ EXPORT_CLASS #define EXPTP_PANDA_GOBJ EXPORT_TEMPL @@ -393,14 +415,6 @@ #define EXPTP_PANDAEGG IMPORT_TEMPL #endif -#ifdef BUILDING_PANDAEXPRESS - #define EXPCL_PANDAEXPRESS EXPORT_CLASS - #define EXPTP_PANDAEXPRESS EXPORT_TEMPL -#else - #define EXPCL_PANDAEXPRESS IMPORT_CLASS - #define EXPTP_PANDAEXPRESS IMPORT_TEMPL -#endif - #ifdef BUILDING_PANDAFX #define EXPCL_PANDAFX EXPORT_CLASS #define EXPTP_PANDAFX EXPORT_TEMPL