diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/Form.hpp curlpp-0.5.1.0-rc5/curlpp/Form.hpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/Form.hpp	Tue Jan 11 05:45:50 2005
--- curlpp-0.5.1.0-rc5/curlpp/Form.hpp	Wed Apr 20 16:25:31 2005
***************
*** 215,221 ****
        const std::string mContent; 
        const std::string mContentType;
      };
!   };
  };
  
  #endif //CURLPP_FORM_HPP
--- 215,221 ----
        const std::string mContent; 
        const std::string mContentType;
      };
!   }
  };
  
  #endif //CURLPP_FORM_HPP
diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/OptionList.cpp curlpp-0.5.1.0-rc5/curlpp/OptionList.cpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/OptionList.cpp	Sat Jan  8 12:19:56 2005
--- curlpp-0.5.1.0-rc5/curlpp/OptionList.cpp	Thu Apr 21 15:07:46 2005
***************
*** 52,58 ****
        delete (*pos).second;
        mOptions.erase(pos);	
     }
!    mOptions.insert(pos, std::make_pair(option->getOption(), option));
  }
  
  
--- 52,58 ----
        delete (*pos).second;
        mOptions.erase(pos);	
     }
!    mOptions.insert(std::make_pair(option->getOption(), option));
  }
  
  
***************
*** 62,68 ****
        pos != options.mOptions.end();
        pos++)
     {
!      setOpt((*pos).second->clone());
     }  
  }
  
--- 62,68 ----
        pos != options.mOptions.end();
        pos++)
     {
!      setOpt(pos->second->clone());
     }  
  }
  
***************
*** 96,102 ****
           pos != other.end();
           pos++)
     {
!       mOptions.insert(std::make_pair((*(*pos).second).getOption(), (*(*pos).second).clone()));
     }
  }
  
--- 96,102 ----
           pos != other.end();
           pos++)
     {
!       mOptions.insert(std::make_pair(pos->second->getOption(), pos->second->clone()));
     }
  }
  
diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/OptionList.hpp curlpp-0.5.1.0-rc5/curlpp/OptionList.hpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/OptionList.hpp	Sat Jan  8 12:19:56 2005
--- curlpp-0.5.1.0-rc5/curlpp/OptionList.hpp	Thu Apr 21 15:08:06 2005
***************
*** 89,95 ****
  	 */
  	OptionList &operator=( const OptionList &rhs );
  
! 	typedef std::map< long, cURLpp::OptionBase * > mapType;
  	
          /**
  	 * print all the options values.
--- 89,95 ----
  	 */
  	OptionList &operator=( const OptionList &rhs );
  
! 	typedef std::map< cURL::CURLoption, cURLpp::OptionBase * > mapType;
  	
          /**
  	 * print all the options values.
diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/Options.hpp curlpp-0.5.1.0-rc5/curlpp/Options.hpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/Options.hpp	Sat Jan  8 12:19:56 2005
--- curlpp-0.5.1.0-rc5/curlpp/Options.hpp	Thu Apr 21 11:41:54 2005
***************
*** 223,227 ****
      typedef cURLpp::OptionTrait< std::string, cURL::CURLOPT_KRB4LEVEL > Krb4Level;
      //Share;
      //TelnetOptions
!   };
  };
--- 223,227 ----
      typedef cURLpp::OptionTrait< std::string, cURL::CURLOPT_KRB4LEVEL > Krb4Level;
      //Share;
      //TelnetOptions
!   }
  };
diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/StorageOptions.hpp curlpp-0.5.1.0-rc5/curlpp/StorageOptions.hpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/curlpp/StorageOptions.hpp	Sat Jan  8 12:19:56 2005
--- curlpp-0.5.1.0-rc5/curlpp/StorageOptions.hpp	Thu Apr 21 11:41:09 2005
***************
*** 42,48 ****
        void setCallback(CallbackType callback);
        void setData(typename Utilspp::TypeTrait< DataType >::ParamType data);
      };
!   };
  };
  
  #include "StorageOptions.inl"
--- 42,48 ----
        void setCallback(CallbackType callback);
        void setData(typename Utilspp::TypeTrait< DataType >::ParamType data);
      };
!   }
  };
  
  #include "StorageOptions.inl"
diff -r -c curlpp.plain/curlpp-0.5.1.0-rc5/examples/example03.cpp curlpp-0.5.1.0-rc5/examples/example03.cpp
*** curlpp.plain/curlpp-0.5.1.0-rc5/examples/example03.cpp	Sat Jan  8 12:19:57 2005
--- curlpp-0.5.1.0-rc5/examples/example03.cpp	Thu Apr 21 13:00:08 2005
***************
*** 31,42 ****
--- 31,45 ----
  class MyWindow
  {};
  
+ extern "C" {
+ 
  int writeDebug(cURL::CURL *, 
  	       cURL::curl_infotype , 
  	       char *, size_t size, void *){
    //here you can do whatever you want with data, a MyWindow * in this case.
    return size;
  }
+ };
  
  int main(int argc, char *argv[])
  {