From 350f437fbe15e5c4da650df053ae034ac2bc5755 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Mon, 12 Mar 2018 18:53:01 -0600 Subject: [PATCH] pandabase: Alphabetically sort pandasymbols.h [skip ci] --- panda/src/pandabase/pandasymbols.h | 94 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h index 59d8a28bd8..dafb15e7f1 100644 --- a/panda/src/pandabase/pandasymbols.h +++ b/panda/src/pandabase/pandasymbols.h @@ -37,6 +37,14 @@ #define EXPTP_FFMPEG IMPORT_TEMPL #endif +#ifdef BUILDING_FMOD_AUDIO + #define EXPCL_FMOD_AUDIO EXPORT_CLASS + #define EXPTP_FMOD_AUDIO EXPORT_TEMPL +#else + #define EXPCL_FMOD_AUDIO IMPORT_CLASS + #define EXPTP_FMOD_AUDIO IMPORT_TEMPL +#endif + #ifdef BUILDING_FRAMEWORK #define EXPCL_FRAMEWORK EXPORT_CLASS #define EXPTP_FRAMEWORK EXPORT_TEMPL @@ -53,14 +61,6 @@ #define EXPTP_MILES_AUDIO IMPORT_TEMPL #endif -#ifdef BUILDING_FMOD_AUDIO - #define EXPCL_FMOD_AUDIO EXPORT_CLASS - #define EXPTP_FMOD_AUDIO EXPORT_TEMPL -#else - #define EXPCL_FMOD_AUDIO IMPORT_CLASS - #define EXPTP_FMOD_AUDIO IMPORT_TEMPL -#endif - #ifdef BUILDING_OPENAL_AUDIO #define EXPCL_OPENAL_AUDIO EXPORT_CLASS #define EXPTP_OPENAL_AUDIO EXPORT_TEMPL @@ -173,14 +173,6 @@ #define EXPTP_PANDAPHYSX IMPORT_TEMPL #endif -#ifdef BUILDING_PANDASPEEDTREE - #define EXPCL_PANDASPEEDTREE EXPORT_CLASS - #define EXPTP_PANDASPEEDTREE EXPORT_TEMPL -#else - #define EXPCL_PANDASPEEDTREE IMPORT_CLASS - #define EXPTP_PANDASPEEDTREE IMPORT_TEMPL -#endif - #ifdef BUILDING_PANDASKEL #define EXPCL_PANDASKEL EXPORT_CLASS #define EXPTP_PANDASKEL EXPORT_TEMPL @@ -189,6 +181,14 @@ #define EXPTP_PANDASKEL IMPORT_TEMPL #endif +#ifdef BUILDING_PANDASPEEDTREE + #define EXPCL_PANDASPEEDTREE EXPORT_CLASS + #define EXPTP_PANDASPEEDTREE EXPORT_TEMPL +#else + #define EXPCL_PANDASPEEDTREE IMPORT_CLASS + #define EXPTP_PANDASPEEDTREE IMPORT_TEMPL +#endif + #ifdef BUILDING_PANDAWIN #define EXPCL_PANDAWIN EXPORT_CLASS #define EXPTP_PANDAWIN EXPORT_TEMPL @@ -247,20 +247,8 @@ #endif -#define EXPCL_PANDA_PGRAPH EXPCL_PANDA -#define EXPTP_PANDA_PGRAPH EXPTP_PANDA - -#define EXPCL_PANDA_PGRAPHNODES EXPCL_PANDA -#define EXPTP_PANDA_PGRAPHNODES EXPTP_PANDA - -#define EXPCL_PANDA_RECORDER EXPCL_PANDA -#define EXPTP_PANDA_RECORDER EXPTP_PANDA - -#define EXPCL_PANDA_PIPELINE EXPCL_PANDA -#define EXPTP_PANDA_PIPELINE EXPTP_PANDA - -#define EXPCL_PANDA_GRUTIL EXPCL_PANDA -#define EXPTP_PANDA_GRUTIL EXPTP_PANDA +#define EXPCL_PANDA_AUDIO EXPCL_PANDA +#define EXPTP_PANDA_AUDIO EXPTP_PANDA #define EXPCL_PANDA_CHAN EXPCL_PANDA #define EXPTP_PANDA_CHAN EXPTP_PANDA @@ -268,9 +256,6 @@ #define EXPCL_PANDA_CHAR EXPCL_PANDA #define EXPTP_PANDA_CHAR EXPTP_PANDA -#define EXPCL_PANDA_PSTATCLIENT EXPCL_PANDA -#define EXPTP_PANDA_PSTATCLIENT EXPTP_PANDA - #define EXPCL_PANDA_COLLIDE EXPCL_PANDA #define EXPTP_PANDA_COLLIDE EXPTP_PANDA @@ -292,6 +277,9 @@ #define EXPCL_PANDA_GOBJ EXPCL_PANDA #define EXPTP_PANDA_GOBJ EXPTP_PANDA +#define EXPCL_PANDA_GRUTIL EXPCL_PANDA +#define EXPTP_PANDA_GRUTIL EXPTP_PANDA + #define EXPCL_PANDA_GSGBASE EXPCL_PANDA #define EXPTP_PANDA_GSGBASE EXPTP_PANDA @@ -304,37 +292,49 @@ #define EXPCL_PANDA_MOVIES EXPCL_PANDA #define EXPTP_PANDA_MOVIES EXPTP_PANDA -#define EXPCL_PANDA_NET EXPCL_PANDA -#define EXPTP_PANDA_NET EXPTP_PANDA - #define EXPCL_PANDA_NATIVENET EXPCL_PANDA #define EXPTP_PANDA_NATIVENET EXPTP_PANDA +#define EXPCL_PANDA_NET EXPCL_PANDA +#define EXPTP_PANDA_NET EXPTP_PANDA + #define EXPCL_PANDA_PARAMETRICS EXPCL_PANDA #define EXPTP_PANDA_PARAMETRICS EXPTP_PANDA -#define EXPCL_PANDA_PNMIMAGETYPES EXPCL_PANDA -#define EXPTP_PANDA_PNMIMAGETYPES EXPTP_PANDA +#define EXPCL_PANDA_PGRAPH EXPCL_PANDA +#define EXPTP_PANDA_PGRAPH EXPTP_PANDA + +#define EXPCL_PANDA_PGRAPHNODES EXPCL_PANDA +#define EXPTP_PANDA_PGRAPHNODES EXPTP_PANDA + +#define EXPCL_PANDA_PGUI EXPCL_PANDA +#define EXPTP_PANDA_PGUI EXPTP_PANDA + +#define EXPCL_PANDA_PIPELINE EXPCL_PANDA +#define EXPTP_PANDA_PIPELINE EXPTP_PANDA #define EXPCL_PANDA_PNMIMAGE EXPCL_PANDA #define EXPTP_PANDA_PNMIMAGE EXPTP_PANDA +#define EXPCL_PANDA_PNMIMAGETYPES EXPCL_PANDA +#define EXPTP_PANDA_PNMIMAGETYPES EXPTP_PANDA + #define EXPCL_PANDA_PNMTEXT EXPCL_PANDA #define EXPTP_PANDA_PNMTEXT EXPTP_PANDA +#define EXPCL_PANDA_PSTATCLIENT EXPCL_PANDA +#define EXPTP_PANDA_PSTATCLIENT EXPTP_PANDA + +#define EXPCL_PANDA_PUTIL EXPCL_PANDA +#define EXPTP_PANDA_PUTIL EXPTP_PANDA + +#define EXPCL_PANDA_RECORDER EXPCL_PANDA +#define EXPTP_PANDA_RECORDER EXPTP_PANDA + #define EXPCL_PANDA_TEXT EXPCL_PANDA #define EXPTP_PANDA_TEXT EXPTP_PANDA #define EXPCL_PANDA_TFORM EXPCL_PANDA #define EXPTP_PANDA_TFORM EXPTP_PANDA -#define EXPCL_PANDA_PUTIL EXPCL_PANDA -#define EXPTP_PANDA_PUTIL EXPTP_PANDA - -#define EXPCL_PANDA_AUDIO EXPCL_PANDA -#define EXPTP_PANDA_AUDIO EXPTP_PANDA - -#define EXPCL_PANDA_PGUI EXPCL_PANDA -#define EXPTP_PANDA_PGUI EXPTP_PANDA - #endif