[Vm-dev] [commit] r2613 - fix prototpes for 64-bit

commits at squeakvm.org commits at squeakvm.org
Mon Sep 17 00:45:14 UTC 2012


Author: piumarta
Date: 2012-09-16 17:45:13 -0700 (Sun, 16 Sep 2012)
New Revision: 2613

Modified:
   trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c
   trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c
Log:
fix prototpes for 64-bit

Modified: trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c
===================================================================
--- trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c	2012-09-16 01:29:31 UTC (rev 2612)
+++ trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c	2012-09-17 00:45:13 UTC (rev 2613)
@@ -60,10 +60,10 @@
 sqInt 	dndOutAcceptedType(char *type, int ntype);
 void    dndOutSend(char *bytes, int nbytes);
 
-int dropInit(void)	{ return 1; }
-int dropShutdown(void)	{ return 1; }
+sqInt dropInit(void)	{ return 1; }
+sqInt dropShutdown(void)	{ return 1; }
 
-char *dropRequestFileName(int dropIndex)	/* in st coordinates */
+char *dropRequestFileName(sqInt dropIndex)	/* in st coordinates */
 {
   if ((dropIndex > 0) && (dropIndex <= uxDropFileCount))
     {
@@ -73,7 +73,7 @@
   return 0;
 }
 
-int dropRequestFileHandle(int dropIndex)
+sqInt dropRequestFileHandle(sqInt dropIndex)
 {
   char *path= dropRequestFileName(dropIndex);
   if (path)
@@ -116,6 +116,6 @@
   dndOutSend(aByteArray, nbytes);
 }
 
-int  sqSecFileAccessCallback(void *callback)		 { return 0; }
-void sqSetNumberOfDropFiles(int numberOfFiles)		 { }
-void sqSetFileInformation(int dropIndex, void *dropFile) { }
+sqInt  sqSecFileAccessCallback(void *callback)		 { return 0; }
+void sqSetNumberOfDropFiles(sqInt numberOfFiles)		 { }
+void sqSetFileInformation(sqInt dropIndex, void *dropFile) { }

Modified: trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c
===================================================================
--- trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c	2012-09-16 01:29:31 UTC (rev 2612)
+++ trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c	2012-09-17 00:45:13 UTC (rev 2613)
@@ -40,7 +40,7 @@
 /* closeWindow: arg is int windowIndex. Fail (return 0) if anything goes wrong
  * - typically the windowIndex invalid or similar
  */
-int closeWindow(int index)
+sqInt closeWindow(sqInt index)
 {
   if (noDisplay)
     return 0;
@@ -55,8 +55,8 @@
  * windows already extant (platform dependant), the specified size being
  * unreasonable etc.
  */
-int createWindowWidthheightoriginXyattrlength(
-	int w, int h, int x, int y, char *list, int attributeListLength)
+sqInt createWindowWidthheightoriginXyattrlength(
+	sqInt w, sqInt h, sqInt x, sqInt y, char *list, sqInt attributeListLength)
 {
   if (noDisplay)
     return 0;
@@ -88,7 +88,7 @@
  * -1 is chosen since itwould correspond to a window size of 64k at 64k which
  * I hope is unlikely for some time to come
  */
-int ioSizeOfWindow(int windowIndex)
+sqInt ioSizeOfWindow(sqInt windowIndex)
 {
   if (noDisplay)
     return -1;
@@ -101,7 +101,7 @@
  * width / height to make the window. Return the actual size the OS
  * produced in (width<<16 || height) format or -1 for failure as above.
  */
-int ioSizeOfWindowSetxy(int windowIndex, int w, int h)
+sqInt ioSizeOfWindowSetxy(sqInt windowIndex, sqInt w, sqInt h)
 {
   if (noDisplay)
     return -1;
@@ -114,7 +114,7 @@
  * window in (left<<16 || top) format like ioScreenSize.
  * Return -1 (as above) for failure - typically invalid windowIndex
  */
-int ioPositionOfWindow(int windowIndex)
+sqInt ioPositionOfWindow(sqInt windowIndex)
 {
   if (noDisplay)
     return -1;
@@ -127,7 +127,7 @@
  * origin x/y for the window. Return the actual origin the OS
  * produced in (left<<16 || top) format or -1 for failure, as above
  */
-int ioPositionOfWindowSetxy(int windowIndex, int x, int y)
+sqInt ioPositionOfWindowSetxy(sqInt windowIndex, sqInt x, sqInt y)
 {
   if (noDisplay)
     return -1;
@@ -140,7 +140,7 @@
  * int size of new title. Fail with -1 if windowIndex is invalid, string is too
  * long for platform etc. Leave previous title in place on failure
  */
-int ioSetTitleOfWindow(int windowIndex, char *newTitle, int sizeOfTitle)
+sqInt ioSetTitleOfWindow(sqInt windowIndex, char *newTitle, sqInt sizeOfTitle)
 {
   if (noDisplay)
     return -1;
@@ -153,7 +153,7 @@
  * Close all the windows that appear to be open.
  * No useful return value since we're getting out of Dodge anyway.
  */
-int ioCloseAllWindows(void)
+sqInt ioCloseAllWindows(void)
 {
   if (noDisplay)
     return 0;



More information about the Vm-dev mailing list