* gdbtypes.h (TYPE_IS_OPAQUE): Correct HAVE_CPLUS_STRUCT check.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3944076..2dd4a29 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-14  Daniel Jacobowitz  <dan@codesourcery.com>
 
+       * gdbtypes.h (TYPE_IS_OPAQUE): Correct HAVE_CPLUS_STRUCT check.
+
+2010-03-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
        * charset.c [USE_WIN32API]: Include <windows.h>.
         (_initialize_charset): Correct type of w32_host_default_charset.
 

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 0315d86..b1e1d0c 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1045,7 +1045,8 @@ extern void allocate_gnat_aux_type (struct type *);
 #define TYPE_IS_OPAQUE(thistype) (((TYPE_CODE (thistype) == TYPE_CODE_STRUCT) ||        \
                                    (TYPE_CODE (thistype) == TYPE_CODE_UNION))        && \
                                   (TYPE_NFIELDS (thistype) == 0)                     && \
-                                  (HAVE_CPLUS_STRUCT (thistype) && (TYPE_NFN_FIELDS (thistype) == 0)) && \
+                                  (!HAVE_CPLUS_STRUCT (thistype)                       \
+                                  || TYPE_NFN_FIELDS (thistype) == 0) &&               \
                                   (TYPE_STUB (thistype) || !TYPE_STUB_SUPPORTED (thistype)))
 
 struct builtin_type