--- gsmlib-1.11/gsmlib/gsm_map_key.h	2002-05-14 23:38:12.000000000 +0400
+++ gsmlib-1.11-fixed/gsmlib/gsm_map_key.h	2004-08-02 00:56:40.997784696 +0400
@@ -25,6 +25,16 @@
 
   // wrapper for map key, can access Sortedtore to get sortOrder()
 
+  // compare two keys
+  template <class SortedStore> class MapKey;
+  
+  template <class SortedStore>
+    bool operator<(const MapKey<SortedStore> &x,
+                          const MapKey<SortedStore> &y);
+  template <class SortedStore>
+    bool operator==(const MapKey<SortedStore> &x,
+                           const MapKey<SortedStore> &y);
+
   template <class SortedStore> class MapKey
   {
     SortedStore &_myStore;   // my store
@@ -47,20 +57,16 @@
 
     friend
     bool operator< 
-#ifndef WIN32
-	<>
-#endif
+	<SortedStore>
 	                 (const MapKey<SortedStore> &x,
                       const MapKey<SortedStore> &y);
     friend
     bool operator==
-#ifndef WIN32
-	<>
-#endif
+	<SortedStore>
 	                  (const MapKey<SortedStore> &x,
                        const MapKey<SortedStore> &y);
   };
-
+/*
   // compare two keys
   template <class SortedStore>
     extern bool operator<(const MapKey<SortedStore> &x,
@@ -68,7 +74,7 @@
   template <class SortedStore>
     extern bool operator==(const MapKey<SortedStore> &x,
                            const MapKey<SortedStore> &y);
-  
+  */
   // MapKey members
   
   template <class SortedStore>