Skip to content

Commit a6893f6

Browse files
smalltalkingsmalltalking
authored
Merge bf33e38 into f219b72 
2 parents f219b72 + bf33e38 commit a6893f6

File tree

14 files changed

+55
-53
lines changed

14 files changed

+55
-53
lines changed

‎platforms/Cross/plugins/CroquetPlugin/CroquetPlugin.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Return value:
1919
Non-zero if successful, zero otherwise.
2020
*/
21-
int ioGatherEntropy(char *bufPtr, int bufSize);
21+
sqInt ioGatherEntropy(char *bufPtr, sqInt bufSize);
2222

2323
/* Imported from tribox.c */
2424
int triBoxOverlap(float minCorner[3],float maxCorner[3],

‎platforms/Mac OS/vm/Developer/sqMacMinimal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ char modifierMap[32] = {
139139
};
140140

141141
/*** Functions ***/
142-
char * GetAttributeString(int id);
142+
char * GetAttributeString(sqInt id);
143143
int HandleEvents(void);
144144
void HandleMenu(int mSelect);
145145
void HandleMouseDown(EventRecord *theEvent);
@@ -727,7 +727,7 @@ int clipboardWriteFromAt(int count, int byteArrayIndex, int startIndex) {
727727

728728
/*** System Attributes ***/
729729

730-
char * GetAttributeString(int id) {
730+
char * GetAttributeString(sqInt id) {
731731
/* This is a hook for getting various status strings back from
732732
the OS. In particular, it allows Squeak to be passed arguments
733733
such as the name of a file to be processed. Command line options

‎platforms/Mac OS/vm/osExports.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
WindowPtr getSTWindow(void);
2323
void setMessageHook(eventMessageHook theHook);
2424
void setPostMessageHook(eventMessageHook theHook);
25-
char * GetAttributeString(int id);
25+
char * GetAttributeString(sqInt id);
2626
#if !NewspeakVM
2727
int serialPortSetControl(int portNum,int control, char *data);
2828
int serialPortIsOpen(int portNum);
2929
int serialPortNames(int portNum, char *portName, char *inName, char *outName);
3030
#endif
3131
Boolean IsKeyDown(void);
32-
int primitivePluginBrowserReady(void);
32+
sqInt primitivePluginBrowserReady(void);
3333
#ifdef ENABLE_URL_FETCH
34-
int primitivePluginDestroyRequest(void);
35-
int primitivePluginRequestFileHandle(void);
36-
int primitivePluginRequestState(void);
37-
int primitivePluginRequestURL(void);
38-
int primitivePluginRequestURLStream(void);
39-
int primitivePluginPostURL(void);
34+
sqInt primitivePluginDestroyRequest(void);
35+
sqInt primitivePluginRequestFileHandle(void);
36+
sqInt primitivePluginRequestState(void);
37+
sqInt primitivePluginRequestURL(void);
38+
sqInt primitivePluginRequestURLStream(void);
39+
sqInt primitivePluginPostURL(void);
4040
#endif
4141

4242
void *os_exports[][3] = {

‎platforms/Mac OS/vm/sqMacMain.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ ioSetLogDirectoryOfSize(void *lblIndex, sqInt sz)
654654
}
655655

656656

657-
char * GetAttributeString(int id) {
657+
char * GetAttributeString(sqInt id) {
658658
/* This is a hook for getting various status strings back from
659659
the OS. In particular, it allows Squeak to be passed arguments
660660
such as the name of a file to be processed. Command line options

‎platforms/Mac OS/vm/sqMacMain.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
void SqueakTerminate();
1919
void ExitCleanup();
20-
char * GetAttributeString(int id);
20+
char * GetAttributeString(sqInt id);
2121
void SqueakTerminate();
2222
void ExitCleanup();
2323
void fetchPreferences();

‎platforms/unix/vm-display-Quartz/zzz/sqUnixQuartz.m‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,13 +2378,13 @@ static int display_winImageFind(char *buf, int len)
23782378
}
23792379

23802380

2381-
static int display_primitivePluginBrowserReady() { return primitiveFail(); }
2382-
static int display_primitivePluginRequestURLStream() { return primitiveFail(); }
2383-
static int display_primitivePluginRequestURL() { return primitiveFail(); }
2384-
static int display_primitivePluginPostURL() { return primitiveFail(); }
2385-
static int display_primitivePluginRequestFileHandle() { return primitiveFail(); }
2386-
static int display_primitivePluginDestroyRequest() { return primitiveFail(); }
2387-
static int display_primitivePluginRequestState() { return primitiveFail(); }
2381+
static sqInt display_primitivePluginBrowserReady() { return primitiveFail(); }
2382+
static sqInt display_primitivePluginRequestURLStream() { return primitiveFail(); }
2383+
static sqInt display_primitivePluginRequestURL() { return primitiveFail(); }
2384+
static sqInt display_primitivePluginPostURL() { return primitiveFail(); }
2385+
static sqInt display_primitivePluginRequestFileHandle() { return primitiveFail(); }
2386+
static sqInt display_primitivePluginDestroyRequest() { return primitiveFail(); }
2387+
static sqInt display_primitivePluginRequestState() { return primitiveFail(); }
23882388

23892389

23902390
///

‎platforms/unix/vm-display-X11/sqUnixMozilla.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static sqStreamRequest *requests[MAX_REQUESTS];
124124
has been established. Only necessary if some
125125
sort of asynchronous communications are used.
126126
*/
127-
int display_primitivePluginBrowserReady()
127+
sqInt display_primitivePluginBrowserReady()
128128
{
129129
if (inBrowser)
130130
{
@@ -145,7 +145,7 @@ int display_primitivePluginBrowserReady()
145145
stream functions.
146146
Note: A request id is the index into requests[].
147147
*/
148-
int display_primitivePluginRequestURLStream()
148+
sqInt display_primitivePluginRequestURLStream()
149149
{
150150
sqStreamRequest *req;
151151
int id, url, length, semaIndex;
@@ -185,7 +185,7 @@ int display_primitivePluginRequestURLStream()
185185
primitivePluginRequestURL: url target: target semaIndex: semaIndex
186186
Request a URL into the given target.
187187
*/
188-
int display_primitivePluginRequestURL()
188+
sqInt display_primitivePluginRequestURL()
189189
{
190190
sqStreamRequest *req;
191191
int url, urlLength;
@@ -227,7 +227,7 @@ int display_primitivePluginRequestURL()
227227
primitivePluginPostURL: url target: target data: data semaIndex: semaIndex
228228
Post data to a URL into the given target.
229229
*/
230-
int display_primitivePluginPostURL()
230+
sqInt display_primitivePluginPostURL()
231231
{
232232
sqStreamRequest *req;
233233
int url, urlLength;
@@ -277,7 +277,7 @@ int display_primitivePluginPostURL()
277277
data. Note: The file handle must be read-only for
278278
security reasons.
279279
*/
280-
int display_primitivePluginRequestFileHandle()
280+
sqInt display_primitivePluginRequestFileHandle()
281281
{
282282
sqStreamRequest *req;
283283
int id, fileOop;

‎platforms/unix/vm/osExports.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
#include "sqMemoryAccess.h"
2+
13
#define XFN(export) {"", #export, (void*)export},
24
#define XFND(export,depth) {"", #export "\000" depth, (void*)export},
35

4-
char * GetAttributeString(int id);
6+
char * GetAttributeString(sqInt id);
57
#if !defined(HEADLESS)
6-
int primitivePluginBrowserReady(void);
7-
int primitivePluginRequestURLStream(void);
8-
int primitivePluginRequestURL(void);
9-
int primitivePluginPostURL(void);
10-
int primitivePluginRequestFileHandle(void);
11-
int primitivePluginDestroyRequest(void);
12-
int primitivePluginRequestState(void);
8+
sqInt primitivePluginBrowserReady(void);
9+
sqInt primitivePluginRequestURLStream(void);
10+
sqInt primitivePluginRequestURL(void);
11+
sqInt primitivePluginPostURL(void);
12+
sqInt primitivePluginRequestFileHandle(void);
13+
sqInt primitivePluginDestroyRequest(void);
14+
sqInt primitivePluginRequestState(void);
1315
void *ioGetDisplay(void);
1416
void *ioGetWindow(void);
1517
#endif

‎platforms/win32/plugins/CroquetPlugin/sqWin32CroquetPlugin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ static int loaded = 0;
55
static HMODULE hAdvApi32 = NULL;
66
static BOOLEAN (__stdcall *RtlGenRandom)(PVOID, ULONG) = NULL;
77

8-
int ioGatherEntropy(char *bufPtr, int bufSize) {
8+
sqInt ioGatherEntropy(char *bufPtr, sqInt bufSize) {
99
if(!loaded) {
1010
loaded = 1;
1111
hAdvApi32 = LoadLibraryA("advapi32.dll");

‎platforms/win32/vm/sqWin32Exports.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdio.h>
22
#include "interp.h"
33

4-
char * GetAttributeString(int id);
4+
char * GetAttributeString(sqInt id);
55
#if !NewspeakVM
66
int win32JoystickDebugInfo(void);
77
int win32JoystickDebugPrintRawValues(void);
@@ -10,14 +10,14 @@ int win32JoystickDebugPrintAlternativeValues(void);
1010
#ifndef NO_NETWORK
1111
int win32DebugPrintSocketState(void);
1212
#endif
13-
int primitivePluginBrowserReady(void);
14-
int primitivePluginRequestURLStream(void);
15-
int primitivePluginRequestURL(void);
16-
int primitivePluginPostURL(void);
17-
int primitivePluginRequestFileHandle(void);
18-
int primitivePluginDestroyRequest(void);
19-
int primitivePluginRequestState(void);
20-
int primitiveDnsInfo(void);
13+
sqInt primitivePluginBrowserReady(void);
14+
sqInt primitivePluginRequestURLStream(void);
15+
sqInt primitivePluginRequestURL(void);
16+
sqInt primitivePluginPostURL(void);
17+
sqInt primitivePluginRequestFileHandle(void);
18+
sqInt primitivePluginDestroyRequest(void);
19+
sqInt primitivePluginRequestState(void);
20+
sqInt primitiveDnsInfo(void);
2121

2222
extern void* stWindow;
2323
extern void* firstMessageHook;

0 commit comments

Comments
 (0)