18237
|
1 |
diff -ur libproxy-0.4.2-old/CMakeLists.txt libproxy-0.4.2-new/CMakeLists.txt
|
|
2 |
--- libproxy-0.4.2-old/CMakeLists.txt 2010-05-20 02:01:34.000000000 +0800
|
|
3 |
+++ libproxy-0.4.2-new/CMakeLists.txt 2010-07-15 14:13:10.285822401 +0800
|
|
4 |
@@ -59,7 +59,8 @@
|
|
5 |
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
|
|
6 |
else()
|
|
7 |
add_definitions(-D_POSIX_C_SOURCE=1)
|
|
8 |
- set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -Os ${CMAKE_CXX_FLAGS}")
|
|
9 |
+ add_definitions(-D__EXTENSIONS__)
|
|
10 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
11 |
endif()
|
16538
|
12 |
|
18237
|
13 |
### Subdirectories
|
|
14 |
diff -ur libproxy-0.4.2-old/libmodman/CMakeLists.txt libproxy-0.4.2-new/libmodman/CMakeLists.txt
|
|
15 |
--- libproxy-0.4.2-old/libmodman/CMakeLists.txt 2010-05-20 02:01:34.000000000 +0800
|
|
16 |
+++ libproxy-0.4.2-new/libmodman/CMakeLists.txt 2010-07-15 14:22:21.779742462 +0800
|
|
17 |
@@ -14,7 +14,7 @@
|
|
18 |
file(MAKE_DIRECTORY test/modules/${MODTYPE})
|
|
19 |
endif()
|
|
20 |
include_directories(../)
|
|
21 |
- add_library(${MODTYPE}_${MODNAME} MODULE libmodman/test/${MODTYPE}_${MODNAME}.cpp)
|
|
22 |
+ add_library(${MODTYPE}_${MODNAME} MODULE test/${MODTYPE}_${MODNAME}.cpp)
|
|
23 |
set_target_properties(${MODTYPE}_${MODNAME} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY test/modules/${MODTYPE})
|
|
24 |
target_link_libraries(${MODTYPE}_${MODNAME} libmodman)
|
|
25 |
endfunction(mm_create_module)
|
|
26 |
@@ -55,7 +55,7 @@
|
|
27 |
else()
|
|
28 |
mm_create_program(symbollnk symbol z)
|
|
29 |
endif()
|
|
30 |
-add_executable(builtin test/builtin.cpp libmodman/test/builtin_one.cpp)
|
|
31 |
+add_executable(builtin test/builtin.cpp test/builtin_one.cpp)
|
|
32 |
target_link_libraries(builtin libmodman)
|
|
33 |
set_property(TARGET builtin PROPERTY COMPILE_DEFINITIONS EXTTYPE=builtin_extension;BUILTIN_MODULE="extension";MM_MODULE_BUILTIN=extension)
|
16538
|
34 |
|
18237
|
35 |
diff -ur libproxy-0.4.2-old/libmodman/module.hpp libproxy-0.4.2-new/libmodman/module.hpp
|
|
36 |
--- libproxy-0.4.2-old/libmodman/module.hpp 2010-05-20 02:01:34.000000000 +0800
|
|
37 |
+++ libproxy-0.4.2-new/libmodman/module.hpp 2010-07-15 14:15:49.467848815 +0800
|
|
38 |
@@ -32,7 +32,11 @@
|
|
39 |
#define __MM_SCLR_DEF_PREFIX extern "C" __MM_DLL_EXPORT
|
|
40 |
#else
|
|
41 |
#include <typeinfo>
|
|
42 |
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
43 |
+#define __MM_DLL_EXPORT __global
|
|
44 |
+#else
|
|
45 |
#define __MM_DLL_EXPORT __attribute__ ((visibility("default")))
|
|
46 |
+#endif
|
|
47 |
#define __MM_FUNC_DEF_PREFIX __MM_DLL_EXPORT
|
|
48 |
#define __MM_SCLR_DEF_PREFIX extern "C" __MM_DLL_EXPORT
|
|
49 |
#endif
|
|
50 |
diff -ur libproxy-0.4.2-old/libproxy/CMakeLists.txt libproxy-0.4.2-new/libproxy/CMakeLists.txt
|
|
51 |
--- libproxy-0.4.2-old/libproxy/CMakeLists.txt 2010-05-20 02:01:34.000000000 +0800
|
|
52 |
+++ libproxy-0.4.2-new/libproxy/CMakeLists.txt 2010-07-15 14:17:36.574924645 +0800
|
|
53 |
@@ -119,11 +119,7 @@
|
|
54 |
endif()
|
|
55 |
endif()
|
16538
|
56 |
|
18237
|
57 |
-# Build the pacrunner into libproxy unless we are building for multiple engines
|
|
58 |
-set(BIPR 1)
|
|
59 |
-if(MOZJS_FOUND AND WEBKIT_FOUND)
|
|
60 |
- set(BIPR 0)
|
|
61 |
-endif()
|
|
62 |
+set(BIPR 0)
|
16538
|
63 |
|
18237
|
64 |
# Add link directories all at once and make it available globally.
|
|
65 |
link_directories(${LIBPROXY_LIBRARY_DIRS})
|
|
66 |
diff -ur libproxy-0.4.2-old/libproxy/url.hpp libproxy-0.4.2-new/libproxy/url.hpp
|
|
67 |
--- libproxy-0.4.2-old/libproxy/url.hpp 2010-05-20 02:01:34.000000000 +0800
|
|
68 |
+++ libproxy-0.4.2-new/libproxy/url.hpp 2010-07-15 14:28:27.182159731 +0800
|
|
69 |
@@ -20,6 +20,8 @@
|
|
70 |
#ifndef URL_HPP_
|
|
71 |
#define URL_HPP_
|
16538
|
72 |
|
18237
|
73 |
+#include <unistd.h>
|
|
74 |
+
|
|
75 |
#include <map>
|
|
76 |
#include <stdexcept>
|
|
77 |
#include <string>
|