1.1 --- a/src/cmpilify.h	Mon Aug 13 10:55:46 2007 -0600
     1.2 +++ b/src/cmpilify.h	Thu Aug 16 17:45:36 2007 -0600
     1.3 @@ -19,6 +19,16 @@
     1.4  #define _CMPILIFY_H
     1.5  
     1.6  #include <cmpidt.h>
     1.7 +#include <cmpimacs.h>
     1.8 +
     1.9 +
    1.10 +#ifndef CMPI_EXTERN_C
    1.11 +  #ifdef __cplusplus
    1.12 +    #define CMPI_EXTERN_C extern "C"
    1.13 +  #else
    1.14 +    #define CMPI_EXTERN_C
    1.15 +  #endif
    1.16 +#endif
    1.17  
    1.18  
    1.19  /* ------------------------------------------------------------------------- */
    1.20 @@ -134,7 +144,7 @@ static CMPIInstanceMIFT _CMPIMIFT = { \
    1.21     CMPILIFYInstance_execQuery, \
    1.22  }; \
    1.23  \
    1.24 -EXTERN_C \
    1.25 +CMPI_EXTERN_C \
    1.26  CMPIInstanceMI* pn##_Create_InstanceMI(const CMPIBroker* brkr, \
    1.27                                         const CMPIContext* ctx, \
    1.28                                         CMPIStatus* rc) { \
    1.29 @@ -245,7 +255,7 @@ static CMPIInstanceMIFT _CMPIMIFT = { \
    1.30     CMPILIFYInstance1RO_execQuery, \
    1.31  }; \
    1.32  \
    1.33 -EXTERN_C \
    1.34 +CMPI_EXTERN_C \
    1.35  CMPIInstanceMI* pn##_Create_InstanceMI(const CMPIBroker* brkr, \
    1.36                                         const CMPIContext* ctx, \
    1.37                                         CMPIStatus* rc) { \
    1.38 @@ -392,7 +402,7 @@ static CMPIInstanceMIFT _CMPIINSTMIFT = 
    1.39     CMPILIFYAssociation_execQuery, \
    1.40  }; \
    1.41  \
    1.42 -EXTERN_C \
    1.43 +CMPI_EXTERN_C \
    1.44  CMPIInstanceMI* pn##_Create_InstanceMI(const CMPIBroker* brkr, \
    1.45                                         const CMPIContext* ctx, \
    1.46                                         CMPIStatus* rc) { \
    1.47 @@ -418,7 +428,7 @@ static CMPIAssociationMIFT _CMPIASSOCMIF
    1.48     CMPILIFYAssociation_referenceNames, \
    1.49  }; \
    1.50  \
    1.51 -EXTERN_C \
    1.52 +CMPI_EXTERN_C \
    1.53  CMPIAssociationMI* pn##_Create_AssociationMI(const CMPIBroker* brkr, \
    1.54                                               const CMPIContext* ctx, \
    1.55                                               CMPIStatus* rc) { \