21825N/A--- libproxy-0.4.7/libmodman/test/CMakeLists.txt-orig 2012-06-13 07:53:10.665392052 -0500

21825N/A+++ libproxy-0.4.7/libmodman/test/CMakeLists.txt 2012-06-13 07:54:08.232674949 -0500

21825N/A@@ -56,11 +56,6 @@ mm_create_program(condition condition)

21825N/A mm_create_program(singleton singleton)

21825N/A mm_create_program(sorted sorted)

21825N/A mm_create_program(symbol symbol)

21825N/A-if (WIN32)

21825N/A- mm_create_program(symbollnk symbol ws2_32)

21825N/A-else()

21825N/A- mm_create_program(symbollnk symbol z)

21825N/A-endif()

21825N/A add_executable(builtin

21825N/A builtin.cpp

21825N/A ${CMAKE_CURRENT_BINARY_DIR}/builtin_one.cpp)

21825N/A--- libproxy-0.4.7/libmodman/CMakeLists.txt-orig 2012-06-13 07:38:26.003797983 -0500

21825N/A+++ libproxy-0.4.7/libmodman/CMakeLists.txt 2012-06-13 07:39:19.220607293 -0500

21825N/A@@ -3,7 +3,7 @@

21825N/A if (WIN32)

21825N/A add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)

21825N/A else(WIN32)

21825N/A- set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fPIC ${CMAKE_CXX_FLAGS}")

21825N/A+ set(CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}")

21825N/A endif(WIN32)

21825N/A include_directories(${CMAKE_SOURCE_DIR})

17289N/A

21825N/A--- libproxy-0.4.7/libmodman/module.hpp-orig 2012-06-13 07:33:28.479264730 -0500

21825N/A+++ libproxy-0.4.7/libmodman/module.hpp 2012-06-13 07:40:45.717700214 -0500

21825N/A@@ -26,11 +26,16 @@

21825N/A #define MM_MODULE_BUILTIN

21825N/A #endif

17536N/A

21825N/A+#ifdef __sun

21825N/A+#define __MM_DLL_EXPORT

21825N/A+#define __PRETTY_FUNCTION__ ""

21825N/A+#else

21825N/A #ifdef _MSC_VER

21825N/A #define __MM_DLL_EXPORT __declspec(dllexport)

21825N/A #else

21825N/A #define __MM_DLL_EXPORT __attribute__ ((visibility("default")))

21825N/A #endif

21825N/A+#endif

17289N/A

21825N/A #define __MM_MODULE_VERSION 2

21825N/A #define __MM_MODULE_VARNAME__(suffix, name) mm_ ## name ## _ ## suffix

21825N/A--- libproxy-0.4.7/libproxy/proxy.cpp-orig 2012-06-13 07:55:21.066582099 -0500

21825N/A+++ libproxy-0.4.7/libproxy/proxy.cpp 2012-06-13 07:57:20.061182803 -0500

21825N/A@@ -17,6 +17,8 @@

21825N/A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

21825N/A ******************************************************************************/

17289N/A

21825N/A+#define __EXTENSIONS__

21825N/A+

21825N/A #include <vector>

21825N/A #include <cstring> // For strdup()

21825N/A #include <iostream> // For cerr

21825N/A--- libproxy-0.4.7/libproxy/url.cpp-orig 2012-06-13 07:57:44.386937151 -0500

21825N/A+++ libproxy-0.4.7/libproxy/url.cpp 2012-06-13 07:58:26.460469913 -0500

21825N/A@@ -20,6 +20,7 @@

21825N/A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

21825N/A *

21825N/A ******************************************************************************/

21825N/A+

21825N/A #ifdef WIN32

21825N/A #include <io.h>

21825N/A #define open _open

21825N/A@@ -33,6 +34,7 @@

21825N/A #include <cstdlib> // For atoi()

21825N/A #include <sys/stat.h> // For stat()

21825N/A #include <algorithm> // For transform()

21825N/A+#include <unistd.h>

17289N/A

21825N/A #ifdef WIN32

21825N/A #include <io.h>

21825N/A--- libproxy-0.4.7/libproxy/modules/config_gnome3.cpp-orig 2012-06-13 08:47:50.981762532 -0500

21825N/A+++ libproxy-0.4.7/libproxy/modules/config_gnome3.cpp 2012-06-13 08:48:10.533828713 -0500

21825N/A@@ -17,6 +17,8 @@

21825N/A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

21825N/A ******************************************************************************/

17289N/A

21825N/A+#define __EXTENSIONS__

21825N/A+

21825N/A #include <cstdio> // For fileno(), fread(), pclose(), popen(), sscanf()

21825N/A #include <sys/select.h> // For select()

21825N/A #include <fcntl.h> // For fcntl()

21825N/A--- libproxy-0.4.7/libproxy/CMakeLists.txt-orig 2012-06-13 08:52:00.679126757 -0500

21825N/A+++ libproxy-0.4.7/libproxy/CMakeLists.txt 2012-06-13 08:52:06.215743001 -0500

21825N/A@@ -7,7 +7,6 @@ if (WIN32)

21825N/A add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)

21825N/A else(WIN32)

21825N/A add_definitions(-D_POSIX_C_SOURCE=1)

21825N/A- set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}")

21825N/A endif(WIN32)

21825N/A

21825N/A ### Modules

21825N/A--- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp-orig 2012-06-14 11:29:47.077964067 -0500

21825N/A+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-06-14 11:33:12.375089092 -0500

21825N/A@@ -17,6 +17,8 @@

21825N/A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

21825N/A ******************************************************************************/

17289N/A

21825N/A+#define __EXTENSIONS__

21825N/A+

21825N/A #include <cstring> // ?

21825N/A

21825N/A #include "../extension_pacrunner.hpp"

21825N/A@@ -32,6 +34,7 @@ using namespace libproxy;

21825N/A #endif

21825N/A #endif

21825N/A #include <jsapi.h>

21825N/A+#include <unistd.h>

21825N/A #include "pacutils.h"

17289N/A

21825N/A #ifndef INET_ADDRSTRLEN

21825N/A@@ -85,7 +88,8 @@ static JSBool myIpAddress(JSContext *cx,

21825N/A if (!gethostname(hostname, 1023)) {

21825N/A JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname));

21825N/A jsval arg = STRING_TO_JSVAL(myhost);

21825N/A- return dnsResolve_(cx, 1, &arg);

21825N/A+ jsval onearg = INT_TO_JSVAL(1);

21825N/A+ return dnsResolve_(cx, onearg, &arg);

21825N/A }

21825N/A JS_free(cx, hostname);

21825N/A JS_SET_RVAL(cx, vp, JSVAL_NULL);