From e2a9e8224e94127cc73cf62ebfb2a8dfee078c0c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 6 Aug 2013 08:32:02 +0000
Subject: compilation fix for Win32 config

git-svn-id: http://svn.miranda-ng.org/main/trunk@5597 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/json/libJSON.cpp |  4 ++--
 src/mir_core/mir_core.def     | 44 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'src/mir_core')

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
-- 
cgit v1.2.3