# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861969 -3600
# Node ID 5431fd16d0e9115db51f92dfafae3bc5b1a79343
# Parent  75d5b8f95acd4f3c83ea01f6f835a3d6c64868c7# Parent  f9d5850708000fb5b8dfbdf1e2570e95d725f740
Merge.

diff -r f9d585070800 -r 5431fd16d0e9 eapol/eapol_framework/eapol_common/am/include/eap_am_types.h
--- 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__)
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -