From 97399235931573a59c2f4e2eb067a6351a79f9ca Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Sun, 4 Mar 2018 19:52:37 -0700
Subject: [PATCH] dconfig: Change export macros to EXP*_DTOOL_DCONFIG

This is for consistency with `panda`, which follows this format.
---
 dtool/src/dconfig/config_dconfig.h | 4 ++--
 dtool/src/dconfig/dconfig.h        | 2 +-
 dtool/src/dtoolbase/dtoolsymbols.h | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dtool/src/dconfig/config_dconfig.h b/dtool/src/dconfig/config_dconfig.h
index 9988086d45..e01fdcf441 100644
--- a/dtool/src/dconfig/config_dconfig.h
+++ b/dtool/src/dconfig/config_dconfig.h
@@ -23,7 +23,7 @@
 #include "dtoolbase.h"
 #include "notifyCategoryProxy.h"
 
-NotifyCategoryDecl(dconfig, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
-NotifyCategoryDecl(microconfig, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
+NotifyCategoryDecl(dconfig, EXPCL_DTOOL_DCONFIG, EXPTP_DTOOL_DCONFIG);
+NotifyCategoryDecl(microconfig, EXPCL_DTOOL_DCONFIG, EXPTP_DTOOL_DCONFIG);
 
 #endif
diff --git a/dtool/src/dconfig/dconfig.h b/dtool/src/dconfig/dconfig.h
index cf6e7396fd..ede79f596f 100644
--- a/dtool/src/dconfig/dconfig.h
+++ b/dtool/src/dconfig/dconfig.h
@@ -30,7 +30,7 @@
  * used primarily by Python code.  For modern code, use the new
  * ConfigVariable* interface instead of this deprecated interface.
  */
-class EXPCL_DTOOLCONFIG DConfig {
+class EXPCL_DTOOL_DCONFIG DConfig {
 PUBLISHED:
   static INLINE bool GetBool(const string &sym, bool def = false);
   static INLINE int GetInt(const string &sym, int def = 0);
diff --git a/dtool/src/dtoolbase/dtoolsymbols.h b/dtool/src/dtoolbase/dtoolsymbols.h
index 98aab5a489..a09ec2fb23 100644
--- a/dtool/src/dtoolbase/dtoolsymbols.h
+++ b/dtool/src/dtoolbase/dtoolsymbols.h
@@ -109,6 +109,9 @@
 #define EXPCL_DTOOL_PRC EXPCL_DTOOLCONFIG
 #define EXPTP_DTOOL_PRC EXPTP_DTOOLCONFIG
 
+#define EXPCL_DTOOL_DCONFIG EXPCL_DTOOLCONFIG
+#define EXPTP_DTOOL_DCONFIG EXPTP_DTOOLCONFIG
+
 
 /* These two are always defined empty, because pystub is statically
    built.  But we leave the symbol around in case we change our minds