Merge.
--- a/eapol/eapol_framework/eapol_common/am/include/eap_am_types.h Sun Mar 14 13:09:54 2010 +0000
+++ b/eapol/eapol_framework/eapol_common/am/include/eap_am_types.h Mon Mar 29 12:26:09 2010 +0100
@@ -26,11 +26,9 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#if !defined(EAP_NO_STDINT_H_HEADER)
#if defined(__GNUC__)
- #include <stdint.h>
-#endif //#if defined(__GNUC__)
-#endif //#if !defined(EAP_NO_STDINT_H_HEADER)
+#define EAP_NO_STDINT_H_HEADER
+#endif // defined(__GNUC__)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -