Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 5e6af07

Browse files
author
Fraser J. Gordon
committed
Minor fixes
1 parent 3e6c313 commit 5e6af07

File tree

12 files changed

+90
-77
lines changed

12 files changed

+90
-77
lines changed

‎builder/tools_builder.rev‎

22 Bytes
Binary file not shown.

‎engine/engine.xcodeproj/xcshareddata/xcschemes/installer.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</BuildActionEntries>
2323
</BuildAction>
2424
<TestAction
25-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
26-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
25+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
26+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2727
shouldUseLaunchSchemeArgsEnv = "YES"
2828
buildConfiguration = "Debug">
2929
<Testables>
@@ -39,8 +39,8 @@
3939
</MacroExpansion>
4040
</TestAction>
4141
<LaunchAction
42-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
43-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
42+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
43+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4444
launchStyle = "0"
4545
useCustomWorkingDirectory = "NO"
4646
buildConfiguration = "Debug"

‎engine/src/java/com/android/vending/billing/IInAppBillingService.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is auto-generated. DO NOT MODIFY.
3-
* Original file: /Users/sebastien/Workspace/refactor-syntax_unicode/engine/src/java/com/android/vending/billing/IInAppBillingService.aidl
3+
* Original file: /Users/frasergordon/Workspace/livecode/engine/src/java/com/android/vending/billing/IInAppBillingService.aidl
44
*/
55
package com.android.vending.billing;
66
/**
@@ -47,13 +47,13 @@ public static com.android.vending.billing.IInAppBillingService asInterface(andro
4747
if ((obj==null)) {
4848
return null;
4949
}
50-
android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
50+
android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
5151
if (((iin!=null)&&(iin instanceof com.android.vending.billing.IInAppBillingService))) {
5252
return ((com.android.vending.billing.IInAppBillingService)iin);
5353
}
5454
return new com.android.vending.billing.IInAppBillingService.Stub.Proxy(obj);
5555
}
56-
@Override public android.os.IBinder asBinder()
56+
public android.os.IBinder asBinder()
5757
{
5858
return this;
5959
}
@@ -177,7 +177,7 @@ private static class Proxy implements com.android.vending.billing.IInAppBillingS
177177
{
178178
mRemote = remote;
179179
}
180-
@Override public android.os.IBinder asBinder()
180+
public android.os.IBinder asBinder()
181181
{
182182
return mRemote;
183183
}
@@ -194,7 +194,7 @@ public java.lang.String getInterfaceDescriptor()
194194
* and "subs" for subscription.
195195
* @return RESULT_OK(0) on success, corresponding result code on failures
196196
*/
197-
@Override public int isBillingSupported(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException
197+
public int isBillingSupported(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException
198198
{
199199
android.os.Parcel _data = android.os.Parcel.obtain();
200200
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -230,7 +230,7 @@ public java.lang.String getInterfaceDescriptor()
230230
* '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
231231
* "title : "Example Title", "description" : "This is an example description" }'
232232
*/
233-
@Override public android.os.Bundle getSkuDetails(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle skusBundle) throws android.os.RemoteException
233+
public android.os.Bundle getSkuDetails(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle skusBundle) throws android.os.RemoteException
234234
{
235235
android.os.Parcel _data = android.os.Parcel.obtain();
236236
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -292,7 +292,7 @@ public java.lang.String getInterfaceDescriptor()
292292
* was signed with the private key of the developer
293293
* TODO: change this to app-specific keys.
294294
*/
295-
@Override public android.os.Bundle getBuyIntent(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException
295+
public android.os.Bundle getBuyIntent(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException
296296
{
297297
android.os.Parcel _data = android.os.Parcel.obtain();
298298
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -343,7 +343,7 @@ public java.lang.String getInterfaceDescriptor()
343343
* next set of in-app purchases. Only set if the
344344
* user has more owned skus than the current list.
345345
*/
346-
@Override public android.os.Bundle getPurchases(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken) throws android.os.RemoteException
346+
public android.os.Bundle getPurchases(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken) throws android.os.RemoteException
347347
{
348348
android.os.Parcel _data = android.os.Parcel.obtain();
349349
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -378,7 +378,7 @@ public java.lang.String getInterfaceDescriptor()
378378
* to be consumed
379379
* @return 0 if consumption succeeded. Appropriate error values for failures.
380380
*/
381-
@Override public int consumePurchase(int apiVersion, java.lang.String packageName, java.lang.String purchaseToken) throws android.os.RemoteException
381+
public int consumePurchase(int apiVersion, java.lang.String packageName, java.lang.String purchaseToken) throws android.os.RemoteException
382382
{
383383
android.os.Parcel _data = android.os.Parcel.obtain();
384384
android.os.Parcel _reply = android.os.Parcel.obtain();

‎engine/src/java/com/sec/android/iap/IAPConnector.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is auto-generated. DO NOT MODIFY.
3-
* Original file: /Users/sebastien/Workspace/refactor-syntax_unicode/engine/src/java/com/sec/android/iap/IAPConnector.aidl
3+
* Original file: /Users/frasergordon/Workspace/livecode/engine/src/java/com/sec/android/iap/IAPConnector.aidl
44
*/
55
package com.sec.android.iap;
66
public interface IAPConnector extends android.os.IInterface
@@ -23,13 +23,13 @@ public static com.sec.android.iap.IAPConnector asInterface(android.os.IBinder ob
2323
if ((obj==null)) {
2424
return null;
2525
}
26-
android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
26+
android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
2727
if (((iin!=null)&&(iin instanceof com.sec.android.iap.IAPConnector))) {
2828
return ((com.sec.android.iap.IAPConnector)iin);
2929
}
3030
return new com.sec.android.iap.IAPConnector.Stub.Proxy(obj);
3131
}
32-
@Override public android.os.IBinder asBinder()
32+
public android.os.IBinder asBinder()
3333
{
3434
return this;
3535
}
@@ -147,15 +147,15 @@ private static class Proxy implements com.sec.android.iap.IAPConnector
147147
{
148148
mRemote = remote;
149149
}
150-
@Override public android.os.IBinder asBinder()
150+
public android.os.IBinder asBinder()
151151
{
152152
return mRemote;
153153
}
154154
public java.lang.String getInterfaceDescriptor()
155155
{
156156
return DESCRIPTOR;
157157
}
158-
@Override public boolean requestCmd(com.sec.android.iap.IAPServiceCallback callback, android.os.Bundle bundle) throws android.os.RemoteException
158+
public boolean requestCmd(com.sec.android.iap.IAPServiceCallback callback, android.os.Bundle bundle) throws android.os.RemoteException
159159
{
160160
android.os.Parcel _data = android.os.Parcel.obtain();
161161
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -180,7 +180,7 @@ public java.lang.String getInterfaceDescriptor()
180180
}
181181
return _result;
182182
}
183-
@Override public boolean unregisterCallback(com.sec.android.iap.IAPServiceCallback callback) throws android.os.RemoteException
183+
public boolean unregisterCallback(com.sec.android.iap.IAPServiceCallback callback) throws android.os.RemoteException
184184
{
185185
android.os.Parcel _data = android.os.Parcel.obtain();
186186
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -198,7 +198,7 @@ public java.lang.String getInterfaceDescriptor()
198198
}
199199
return _result;
200200
}
201-
@Override public android.os.Bundle init(int mode) throws android.os.RemoteException
201+
public android.os.Bundle init(int mode) throws android.os.RemoteException
202202
{
203203
android.os.Parcel _data = android.os.Parcel.obtain();
204204
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -221,7 +221,7 @@ public java.lang.String getInterfaceDescriptor()
221221
}
222222
return _result;
223223
}
224-
@Override public android.os.Bundle getItemList(int mode, java.lang.String packageName, java.lang.String itemGroupId, int startNum, int endNum, java.lang.String itemType) throws android.os.RemoteException
224+
public android.os.Bundle getItemList(int mode, java.lang.String packageName, java.lang.String itemGroupId, int startNum, int endNum, java.lang.String itemType) throws android.os.RemoteException
225225
{
226226
android.os.Parcel _data = android.os.Parcel.obtain();
227227
android.os.Parcel _reply = android.os.Parcel.obtain();
@@ -249,7 +249,7 @@ public java.lang.String getInterfaceDescriptor()
249249
}
250250
return _result;
251251
}
252-
@Override public android.os.Bundle getItemsInbox(java.lang.String packageName, java.lang.String itemGroupId, int startNum, int endNum, java.lang.String startDate, java.lang.String endDate) throws android.os.RemoteException
252+
public android.os.Bundle getItemsInbox(java.lang.String packageName, java.lang.String itemGroupId, int startNum, int endNum, java.lang.String startDate, java.lang.String endDate) throws android.os.RemoteException
253253
{
254254
android.os.Parcel _data = android.os.Parcel.obtain();
255255
android.os.Parcel _reply = android.os.Parcel.obtain();

‎engine/src/java/com/sec/android/iap/IAPServiceCallback.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is auto-generated. DO NOT MODIFY.
3-
* Original file: /Users/sebastien/Workspace/refactor-syntax_unicode/engine/src/java/com/sec/android/iap/IAPServiceCallback.aidl
3+
* Original file: /Users/frasergordon/Workspace/livecode/engine/src/java/com/sec/android/iap/IAPServiceCallback.aidl
44
*/
55
package com.sec.android.iap;
66
public interface IAPServiceCallback extends android.os.IInterface
@@ -23,13 +23,13 @@ public static com.sec.android.iap.IAPServiceCallback asInterface(android.os.IBin
2323
if ((obj==null)) {
2424
return null;
2525
}
26-
android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
26+
android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
2727
if (((iin!=null)&&(iin instanceof com.sec.android.iap.IAPServiceCallback))) {
2828
return ((com.sec.android.iap.IAPServiceCallback)iin);
2929
}
3030
return new com.sec.android.iap.IAPServiceCallback.Stub.Proxy(obj);
3131
}
32-
@Override public android.os.IBinder asBinder()
32+
public android.os.IBinder asBinder()
3333
{
3434
return this;
3535
}
@@ -65,15 +65,15 @@ private static class Proxy implements com.sec.android.iap.IAPServiceCallback
6565
{
6666
mRemote = remote;
6767
}
68-
@Override public android.os.IBinder asBinder()
68+
public android.os.IBinder asBinder()
6969
{
7070
return mRemote;
7171
}
7272
public java.lang.String getInterfaceDescriptor()
7373
{
7474
return DESCRIPTOR;
7575
}
76-
@Override public void responseCallback(android.os.Bundle bundle) throws android.os.RemoteException
76+
public void responseCallback(android.os.Bundle bundle) throws android.os.RemoteException
7777
{
7878
android.os.Parcel _data = android.os.Parcel.obtain();
7979
try {

‎libexternal/src/external.c‎

100644100755
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,15 +691,14 @@ void SetVariableExUTF8(const char *p_name, const char *p_key, const ExternalStri
691691
void GetArrayUTF8(const char *p_name, int *r_element_count, ExternalString *r_values, char **r_keys, Bool p_is_text, int *r_success)
692692
{
693693
ExternalArray t_array;
694+
int t_operation;
694695
char *t_result;
695696

696697
if (s_external_interface_version < 2)
697698
{
698699
*r_success = EXTERNAL_FAILURE;
699700
return;
700701
}
701-
702-
int t_operation;
703702
if (p_is_text)
704703
t_operation = OPERATION_GET_ARRAY_UTF8_TEXT;
705704
else
@@ -719,6 +718,7 @@ void GetArrayUTF8(const char *p_name, int *r_element_count, ExternalString *r_va
719718
void SetArrayUTF8(const char *p_name, int p_element_count, ExternalString *p_values, char **p_keys, Bool p_is_text, int *r_success)
720719
{
721720
ExternalArray t_array;
721+
int t_operation;
722722
char *t_result;
723723

724724
if (s_external_interface_version < 2)
@@ -727,7 +727,6 @@ void SetArrayUTF8(const char *p_name, int p_element_count, ExternalString *p_val
727727
return;
728728
}
729729

730-
int t_operation;
731730
if (p_is_text)
732731
t_operation = OPERATION_SET_ARRAY_UTF8_TEXT;
733732
else

‎libfoundation/src/foundation-unicode.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,6 +1336,13 @@ int32_t MCUnicodeCollate(MCLocaleRef p_locale, MCUnicodeCollateOption p_options,
13361336
icu::Collator* t_collator;
13371337
t_collator = icu::Collator::createInstance(MCLocaleGetICULocale(p_locale), t_error);
13381338

1339+
// If we couldn't create a collator for the given locale, create a default one
1340+
if (t_collator == NULL)
1341+
{
1342+
t_error = U_ZERO_ERROR;
1343+
t_collator = icu::Collator::createInstance(t_error);
1344+
}
1345+
13391346
// Set the collation options
13401347
// Note that the enumerated strengths have the same values as the ICU enum
13411348
switch (p_options & kMCUnicodeCollateOptionStrengthMask)

‎revbrowser/revbrowser.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/>
3939
<Tool
4040
Name="VCCLCompilerTool"
41-
AdditionalIncludeDirectories="&quot;$(SolutionDir)thirdparty\libcef&quot;"
41+
AdditionalIncludeDirectories="&quot;$(SolutionDir)libcore\include&quot;;&quot;$(SolutionDir)thirdparty\libcef&quot;"
4242
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REVBROWSER_EXPORTS;ATLASSUME="
4343
MinimalRebuild="true"
4444
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
115115
/>
116116
<Tool
117117
Name="VCCLCompilerTool"
118-
AdditionalIncludeDirectories="&quot;$(SolutionDir)thirdparty\libcef&quot;"
118+
AdditionalIncludeDirectories="&quot;$(SolutionDir)libcore\include&quot;;&quot;$(SolutionDir)thirdparty\libcef&quot;"
119119
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REVBROWSER_EXPORTS"
120120
UsePrecompiledHeader="0"
121121
DebugInformationFormat="3"

0 commit comments

Comments
 (0)