diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-06 08:32:02 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-06 08:32:02 +0000 |
| commit | e2a9e8224e94127cc73cf62ebfb2a8dfee078c0c (patch) | |
| tree | bfb45d85f60c8428a425327ef8f7c3f3776e108f | |
| parent | 7e0fe901cf2f2334c59eafffcdc85de3a02386ae (diff) | |
compilation fix for Win32 config
git-svn-id: http://svn.miranda-ng.org/main/trunk@5597 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | bin10/lib/mir_core.lib | bin | 47718 -> 47884 bytes | |||
| -rw-r--r-- | bin10/lib/mir_core64.lib | bin | 43568 -> 43568 bytes | |||
| -rw-r--r-- | bin11/lib/mir_core.lib | bin | 47718 -> 47884 bytes | |||
| -rw-r--r-- | bin11/lib/mir_core64.lib | bin | 43568 -> 43568 bytes | |||
| -rw-r--r-- | include/m_json.h | 2 | ||||
| -rw-r--r-- | src/mir_core/json/libJSON.cpp | 4 | ||||
| -rw-r--r-- | src/mir_core/mir_core.def | 44 |
7 files changed, 47 insertions, 3 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib Binary files differindex b316fe8c42..93b9760ba0 100644 --- a/bin10/lib/mir_core.lib +++ b/bin10/lib/mir_core.lib diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib Binary files differindex e234825ab3..ee29aa2f4d 100644 --- a/bin10/lib/mir_core64.lib +++ b/bin10/lib/mir_core64.lib diff --git a/bin11/lib/mir_core.lib b/bin11/lib/mir_core.lib Binary files differindex 09d09166b8..2cce7c5cd6 100644 --- a/bin11/lib/mir_core.lib +++ b/bin11/lib/mir_core.lib diff --git a/bin11/lib/mir_core64.lib b/bin11/lib/mir_core64.lib Binary files differindex cbe3f4b8d0..7a517c3c86 100644 --- a/bin11/lib/mir_core64.lib +++ b/bin11/lib/mir_core64.lib diff --git a/include/m_json.h b/include/m_json.h index e635814299..299111d3cd 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -119,7 +119,7 @@ MIR_CORE_DLL(int) json_equal(JSONNODE * node, JSONNODE * node2); #ifdef __cplusplus
#ifdef _XSTRING_
-MIR_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node);
+MIR_C_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node);
#endif
}
diff --git a/src/mir_core/json/libJSON.cpp b/src/mir_core/json/libJSON.cpp index c8f7a0e3ff..ebba2f2fd4 100644 --- a/src/mir_core/json/libJSON.cpp +++ b/src/mir_core/json/libJSON.cpp @@ -276,8 +276,8 @@ MIR_CORE_DLL(json_char*) json_as_string(const JSONNODE * node){ return toCString(((JSONNode*)node) -> as_string());
}
-MIR_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node){
- JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_string"), return toCString(EMPTY_CSTRING););
+MIR_C_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node){
+ JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_string"), return EMPTY_CSTRING;);
return ((JSONNode*)node) -> as_string();
}
diff --git a/src/mir_core/mir_core.def b/src/mir_core/mir_core.def index 12960b2e08..0c559cae83 100644 --- a/src/mir_core/mir_core.def +++ b/src/mir_core/mir_core.def @@ -174,3 +174,47 @@ ProtoHookEvent @171 ProtoCreateHookableEvent @172
ProtoForkThread @173
ProtoForkThreadEx @174
+json_as_array @175
+json_as_bool @176
+json_as_float @177
+json_as_int @178
+json_as_node @179
+json_as_string @180
+json_as_pstring @181
+json_at @182
+json_cast @183
+json_clear @184
+json_copy @185
+json_delete @186
+json_duplicate @187
+json_empty @188
+json_equal @189
+json_free @190
+json_get @191
+json_merge @192
+json_name @193
+json_new @194
+json_new_a @195
+json_new_b @196
+json_new_f @197
+json_new_i @198
+json_nullify @199
+json_parse @200
+json_pop_back @201
+json_pop_back_at @202
+json_preparse @203
+json_push_back @204
+json_reserve @205
+json_set_a @206
+json_set_b @207
+json_set_f @208
+json_set_i @209
+json_set_n @210
+json_set_name @211
+json_size @212
+json_strip_white_space @213
+json_swap @214
+json_type @215
+json_write @216
+json_write_formatted @217
+mir_subclassWindowFull @218
|