--- a/eapol/eapol_framework/eapol_common/am/include/eap_am_export.h Fri Sep 17 08:30:11 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/eap_am_export.h Mon Oct 04 00:19:54 2010 +0300
@@ -16,37 +16,67 @@
*/
/*
-* %version: %
+* %version: 4.1.8 %
*/
-#if !defined( _EAP_EXPORT_H_ )
-#define _EAP_EXPORT_H_
+#if !defined( _EAP_AM_EXPORT_H_ )
+#define _EAP_AM_EXPORT_H_
#if defined(EAP_NO_EXPORTS)
// No exports are needed.
- #define EAP_FUNC_IMPORT
- #define EAP_FUNC_EXPORT
- #define EAP_C_FUNC_IMPORT
- #define EAP_C_FUNC_EXPORT
- #define EAP_FUNC_IMPORT_EMPTY
- #define EAP_FUNC_EXPORT_EMPTY
- #define EAP_EXPORT
- #define EAP_NONSHARABLE_CLASS
+ #if defined(__WINS__)
+ #define EAP_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_IMPORT
+ #define EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_IMPORT_EMPTY
+ #define EAP_FUNC_EXPORT_EMPTY
+ #define EAP_EXPORT
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE
+ #define EAP_NONSHARABLE_CLASS
+ #else
+ #define EAP_FUNC_IMPORT __declspec(dllimport)
+ #define EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_IMPORT __declspec(dllimport)
+ #define EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_IMPORT_EMPTY
+ #define EAP_FUNC_EXPORT_EMPTY
+ #define EAP_EXPORT __declspec(notshared) /* This is used marking a class non-sharable. */
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE __declspec(notshared)
+ #define EAP_NONSHARABLE_CLASS
+ #endif
#if defined(__WINS__)
#pragma warning( disable : 4355 )
#endif /* defined(__WINS__) */
#elif defined(__SYMBIAN32__)
// This is Symbian compilation.
- #define EAP_FUNC_IMPORT IMPORT_C
- #define EAP_FUNC_EXPORT EXPORT_C
- #define EAP_C_FUNC_IMPORT IMPORT_C
- #define EAP_C_FUNC_EXPORT EXPORT_C
- #define EAP_FUNC_IMPORT_EMPTY
- #define EAP_FUNC_EXPORT_EMPTY
- #define EAP_EXPORT
#if defined(__WINS__)
- #define EAP_NONSHARABLE_CLASS
+ #define EAP_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT __declspec(dllexport)
+ #define EAP_C_FUNC_IMPORT
+ #define EAP_C_FUNC_EXPORT __declspec(dllexport)
+ #define EAP_FUNC_IMPORT_EMPTY
+ #define EAP_FUNC_EXPORT_EMPTY
+ #define EAP_EXPORT
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE
+ #define EAP_NONSHARABLE_CLASS __declspec(notshared)
#else
+ #define EAP_FUNC_IMPORT __declspec(dllimport)
+ #define EAP_FUNC_EXPORT __declspec(dllexport)
+ #define EAP_C_FUNC_IMPORT __declspec(dllimport)
+ #define EAP_C_FUNC_EXPORT __declspec(dllexport)
+ #define EAP_FUNC_IMPORT_EMPTY
+ #define EAP_FUNC_EXPORT_EMPTY
+ #define EAP_EXPORT
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE __declspec(notshared)
#define EAP_NONSHARABLE_CLASS __declspec(notshared)
#endif
#if defined(__WINS__)
@@ -61,6 +91,9 @@
#define EAP_FUNC_IMPORT_EMPTY
#define EAP_FUNC_EXPORT_EMPTY
#define EAP_EXPORT
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE
#define EAP_NONSHARABLE_CLASS
#elif defined(__GNUC__)
// This is cygwin compilation.
@@ -71,22 +104,29 @@
#define EAP_FUNC_IMPORT_EMPTY
#define EAP_FUNC_EXPORT_EMPTY
#define EAP_EXPORT __declspec(dllexport)
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE
#define EAP_NONSHARABLE_CLASS
#elif defined(_WIN32) && !defined(__GNUC__)
// This is windows compilation.
#define EAP_FUNC_IMPORT
- #define EAP_FUNC_EXPORT
- #define EAP_C_FUNC_IMPORT __declspec(dllexport)
- #define EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_IMPORT
+ #define EAP_C_FUNC_EXPORT
#define EAP_FUNC_IMPORT_EMPTY
#define EAP_FUNC_EXPORT_EMPTY
- #define EAP_EXPORT __declspec(dllexport)
- #define EAP_NONSHARABLE_CLASS
+ #define EAP_EXPORT
+ #define EAP_IMPORT
+ #define EAP_SHARABLE
+ #define EAP_NONSHARABLE
+ #define EAP_NONSHARABLE_CLASS
#if defined(__WINS__)
#pragma warning( disable : 4355 )
#endif /* defined(__WINS__) */
#endif
+#if 0
// This is for separate exports of interface functions.
#if defined(USE_EAP_INTERFACE_EXPORTS)
#if defined(__SYMBIAN32__)
@@ -111,8 +151,9 @@
#define EAP_FUNC_EXPORT_INTERFACE EAP_FUNC_EXPORT
#define EAP_EXPORT_INTERFACE EAP_EXPORT
#endif //#if defined(USE_EAP_INTERFACE_EXPORTS)
+#endif //#if 0
-#endif //#if !defined( _EAP_EXPORT_H_ )
+#endif //#if !defined( _EAP_AM_EXPORT_H_ )