[openib-general] Conflicting typedefs for "ib_gid_t"

[Lakshmanan, Madhu]

In .../include/infiniband/mad.h,  it is:

    typedef uint8_t ib_gid_t[16];

In .../include/infiniband/iba/ib_types.h, it is:

    #include <complib/cl_packon.h>
    typedef union _ib_gid
    {
        uint8_t raw[16];
        struct _ib_gid_unicast
        {
            ib_gid_prefix_t prefix;
            ib_net64_t      interface_id;

        } PACK_SUFFIX unicast;

        struct _ib_gid_multicast
        {
            uint8_t         header[2];
            uint8_t         raw_group_id[14];

        } PACK_SUFFIX multicast;

    } PACK_SUFFIX ib_gid_t;
    #include <complib/cl_packoff.h>

I need to include both files for a user space tool and I'm getting a compile error due to the conflict. Is it not the norm for a user space application to include both files?
Appreciate any thoughts on this.

Madhu Lakshmanan
Silverstorm Technologies, Inc.
mlakshmanan at silverstorm.com