Backed out revisions 2221:2219 and most of change 2216.

msvc/exiv2lib/exiv2lib.vcproj

@@ -36,7 +36,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="Ws2_32.lib"
 				OutputFile="$(OutDir)/exiv2.lib"
 				AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32\bin\debug"/>
 			<Tool
@@ -92,7 +91,6 @@ cd ..\..\exiv2lib
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="Ws2_32.lib"
 				OutputFile="$(OutDir)/exiv2.lib"
 				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32\bin\release"/>
 			<Tool
@@ -156,7 +154,7 @@ cd ..\..\exiv2lib
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBMTD"
-				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib  Ws2_32.lib"
+				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="TRUE"
 				ImportLibrary="$(TargetDir)\exiv2.lib"
@@ -223,7 +221,7 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib  Ws2_32.lib"
+				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="FALSE"
 				ImportLibrary="$(TargetDir)\exiv2.lib"

src/CMakeLists.txt

@@ -187,13 +187,7 @@ SET_TARGET_PROPERTIES( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
                                         DEFINE_SYMBOL EXV_BUILDING_LIB
                      )
 
-IF(WIN32)
+TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
-    SET(OS_SPECIFIC_LIBS wsock32)
-ELSE(WIN32)
-    SET(OS_SPECIFIC_LIBS )
-ENDIF(WIN32)
-    
-TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} ${OS_SPECIFIC_LIBS})
 
 if( EXIV2_EXIV2_ENABLE_LIBXMP )
     TARGET_LINK_LIBRARIES( exiv2 ${XMPLIB} )

src/makernote.cpp

@@ -30,18 +30,10 @@ EXIV2_RCSID("@(#) $Id$")
 
 // *****************************************************************************
 // included header files
-
+#ifdef _MSC_VER
-// htonl method (sony_decrypt)
-#ifdef _MSC_VER                    // MSVC case
 # include "exv_msvc.h"
-# include <winsock.h>
 #else
 # include "exv_conf.h"
-# ifdef WIN32                      // MINGW32 case
-#  include <winsock2.h>
-# else                             // LINUX case
-#  include <arpa/inet.h>
-# endif
 #endif
 
 #include "makernote_int.hpp"