diff --git a/wst/trunk/samples/user_client_console/user_client_console.lpi b/wst/trunk/samples/user_client_console/user_client_console.lpi index e1bc86f20..fba768eb0 100644 --- a/wst/trunk/samples/user_client_console/user_client_console.lpi +++ b/wst/trunk/samples/user_client_console/user_client_console.lpi @@ -1,8 +1,8 @@ + - @@ -12,10 +12,9 @@ - - + @@ -28,13 +27,10 @@ - + - - - - + @@ -50,18 +46,19 @@ - + - + + @@ -72,6 +69,9 @@ + + + diff --git a/wst/trunk/samples/user_client_console/user_client_console.pas b/wst/trunk/samples/user_client_console/user_client_console.pas index a597e8705..d0f7f005d 100644 --- a/wst/trunk/samples/user_client_console/user_client_console.pas +++ b/wst/trunk/samples/user_client_console/user_client_console.pas @@ -148,14 +148,16 @@ const ADDRESS_MAP : array[TTransportType] of string = ( //'TCP:Address=172.16.82.31;Port=1234;target=UserService', 'TCP:Address=127.0.0.1;Port=1234;target=UserService', //'http:Address=http://127.0.0.1:8888/wst/services/lib_server/UserService' - 'http:Address=http://127.0.0.1:8080/wst/services/UserService' + 'http:Address=http://127.0.0.1:8000/services/UserService' + //'http:Address=http://127.0.0.1:8080/cgi-bin/demoservice.cgi/WST/%s/UserService/' ); - FORMAT_MAP : array[TFormatType] of string =( 'binary', 'soap', 'xmlrpc', 'json', 'json' ); + FORMAT_MAP : array[TFormatType] of string =( 'binary', 'SOAP', 'xmlrpc', 'json', 'json' ); var buffTransport, buffFormat : string; begin if ( TransportType = ttHTTP ) then buffTransport := Format('%s/?format=%s',[ADDRESS_MAP[TransportType],FORMAT_MAP[FormatValue]]) + //buffTransport := Format(ADDRESS_MAP[TransportType],[FORMAT_MAP[FormatValue]]) else buffTransport := ADDRESS_MAP[TransportType]; if ( TransportType = ttLibrary ) then diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc index 41c94a7e7..31af7415b 100644 --- a/wst/trunk/wst_global.inc +++ b/wst/trunk/wst_global.inc @@ -24,6 +24,15 @@ } { $DEFINE HAS_JSON_CLONE} {$IFEND} + {$IF Defined(FPC_VERSION) and + ( (FPC_VERSION > 2) or + ( (FPC_VERSION = 2) and + (FPC_RELEASE > 4) + ) + ) + } + {$DEFINE WST_HAS_JSON_INT64} + {$IFEND} {$IF Defined(FPC_VERSION) and (FPC_VERSION = 2) } {$IF Defined(FPC_RELEASE) } @@ -31,8 +40,7 @@ {$define FPC_211} {$IF Defined(FPC_RELEASE) and (FPC_RELEASE > 2) } {$DEFINE WST_TKPROCVAR} - {$DEFINE WST_UNICODESTRING} - {$DEFINE WST_HAS_JSON_INT64} + {$DEFINE WST_UNICODESTRING} {$IFEND} {$IF Defined(FPC_RELEASE) and (FPC_RELEASE > 2) } {$DEFINE TDOMNodeList_RELEASE_NOT_FREE}