diff options
| author | Murray Cumming <murrayc@src.gnome.org> | 2006-05-12 08:08:45 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2006-05-12 08:08:45 +0000 |
| commit | 732822b53ea288a33d370048eca6f119fbe612bb (patch) | |
| tree | 8db5098505211c14693338c71001707313531097 /glib/glibmmconfig.h.in | |
| parent | 10d607afe1ade71a232f05b2d398693a4a26b964 (diff) | |
| download | glibmm-732822b53ea288a33d370048eca6f119fbe612bb.tar.gz | |
Merged changes from glibmm-2-10 branch.
Diffstat (limited to 'glib/glibmmconfig.h.in')
| -rw-r--r-- | glib/glibmmconfig.h.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in index d3081cae..292b0f23 100644 --- a/glib/glibmmconfig.h.in +++ b/glib/glibmmconfig.h.in @@ -28,9 +28,6 @@ #endif /* _WIN32 */ #ifdef GLIBMM_CONFIGURE -/* compiler feature tests that are used during compile time and run-time - by gtk-- only. tests used by gdk-- and gtk-- should go into - gdk--config.h.in */ #undef GLIBMM_CXX_HAVE_MUTABLE #undef GLIBMM_CXX_HAVE_NAMESPACES //#undef GLIBMM_CXX_GAUB @@ -46,6 +43,9 @@ #undef GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS #undef GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC #undef GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS +#undef GLIBMM_PROPERTIES_ENABLED +#undef GLIBMM_VFUNCS_ENABLED +#undef GLIBMM_EXCEPTIONS_ENABLED #endif #ifdef GLIBMM_MSC @@ -58,6 +58,9 @@ #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 #define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 #define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 + #define GLIBMM_PROPERTIES_ENABLED 1 + #define GLIBMM_VFUNCS_ENABLED 1 + #define GLIBMM_EXCEPTIONS_ENABLED 1 #pragma warning (disable: 4786 4355 4800 4181) #endif |