Line 0
Link Here
|
|
|
1 |
--- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100 |
2 |
+++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100 |
3 |
@@ -29,7 +29,7 @@ |
4 |
|
5 |
// ------------------------------------------------------------------ |
6 |
static bool any_set = false; |
7 |
-static std::map<std::string, std::string> mmap; |
8 |
+static std::map<std::string, std::string> sockets_mmap; |
9 |
|
10 |
// ------------------------------------------------------------------ |
11 |
void show_info() |
12 |
@@ -110,24 +110,24 @@ |
13 |
*/ |
14 |
void setup_configuration() |
15 |
{ |
16 |
- mmap["openssl"] = "HAVE_OPENSSL"; |
17 |
- mmap["ipv6"] = "ENABLE_IPV6"; |
18 |
- mmap["sctp"] = "USE_SCTP"; |
19 |
- mmap["no_addrinfo"] = "NO_GETADDRINFO"; |
20 |
- mmap["pool"] = "ENABLE_POOL"; |
21 |
- mmap["socks4"] = "ENABLE_SOCKS4"; |
22 |
- mmap["resolver"] = "ENABLE_RESOLVER"; |
23 |
- mmap["reconnect"] = "ENABLE_RECONNECT"; |
24 |
- mmap["detach"] = "ENABLE_DETACH"; |
25 |
- mmap["exceptions"] = "ENABLE_EXCEPTIONS"; |
26 |
- mmap["xml2"] = "ENABLE_XML"; |
27 |
+ sockets_mmap["openssl"] = "HAVE_OPENSSL"; |
28 |
+ sockets_mmap["ipv6"] = "ENABLE_IPV6"; |
29 |
+ sockets_mmap["sctp"] = "USE_SCTP"; |
30 |
+ sockets_mmap["no_addrinfo"] = "NO_GETADDRINFO"; |
31 |
+ sockets_mmap["pool"] = "ENABLE_POOL"; |
32 |
+ sockets_mmap["socks4"] = "ENABLE_SOCKS4"; |
33 |
+ sockets_mmap["resolver"] = "ENABLE_RESOLVER"; |
34 |
+ sockets_mmap["reconnect"] = "ENABLE_RECONNECT"; |
35 |
+ sockets_mmap["detach"] = "ENABLE_DETACH"; |
36 |
+ sockets_mmap["exceptions"] = "ENABLE_EXCEPTIONS"; |
37 |
+ sockets_mmap["xml2"] = "ENABLE_XML"; |
38 |
} |
39 |
|
40 |
// ------------------------------------------------------------------ |
41 |
void set(const char *param, bool enable) |
42 |
{ |
43 |
- std::map<std::string, std::string>::iterator it = mmap.find(param); |
44 |
- if (it == mmap.end()) |
45 |
+ std::map<std::string, std::string>::iterator it = sockets_mmap.find(param); |
46 |
+ if (it == sockets_mmap.end()) |
47 |
{ |
48 |
fprintf(stderr, "Option '%s' not found, aborting\n", param); |
49 |
exit(-1); |
50 |
@@ -195,7 +195,7 @@ |
51 |
{ |
52 |
int i = (*slask == '#') ? 8 : 10; |
53 |
std::string def(&slask[i]); |
54 |
- for (std::map<std::string, std::string>::iterator it = mmap.begin(); it != mmap.end(); it++) |
55 |
+ for (std::map<std::string, std::string>::iterator it = sockets_mmap.begin(); it != sockets_mmap.end(); it++) |
56 |
{ |
57 |
if (def == it -> second) |
58 |
{ |