diff --git a/common/hashmap.h b/common/hashmap.h
index 20102159913..fbefbc916e4 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -120,8 +120,9 @@ public:
 	class Iterator {
 		typedef const HashMap<Key, Val, HashFunc, EqualFunc> *hashmap_t;
 		friend class HashMap<Key, Val, HashFunc, EqualFunc>;
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 0)
+#if (__GNUC__ == 4) && ( (__GNUC_MINOR__ == 0) || (__GNUC_MINOR__ == 1 && defined(_WIN32_WCE)) )
 	public:	// FIXME: Work around a bug in gcc version 4.0 (gcc 4.0.1 Apple Computer, Inc. build 5367 and gcc 4.0.2 AmigaOS build 20051012)
+			//		  Also in gcc v. 4.1.0 for windows ce (cegcc)
 #endif
 		uint _idx;
 		hashmap_t _hashmap;