[Vm-dev] [commit][3167] Guard the obsolete old sound prims with #if OLD_SOUND_PRIMS so as not to break

commits at squeakvm.org commits at squeakvm.org
Wed Dec 10 21:04:07 UTC 2014


Revision: 3167
Author:   eliot
Date:     2014-12-10 13:04:05 -0800 (Wed, 10 Dec 2014)
Log Message:
-----------
Guard the obsolete old sound prims with #if OLD_SOUND_PRIMS so as not to break
64-bit builds.  Break a line in DropPlugin.h

Modified Paths:
--------------
    trunk/platforms/Cross/plugins/DropPlugin/DropPlugin.h
    trunk/platforms/Cross/plugins/SoundGenerationPlugin/SoundGenerationPlugin.h
    trunk/platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c

Property Changed:
----------------
    trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h

Modified: trunk/platforms/Cross/plugins/DropPlugin/DropPlugin.h
===================================================================
--- trunk/platforms/Cross/plugins/DropPlugin/DropPlugin.h	2014-12-10 20:28:32 UTC (rev 3166)
+++ trunk/platforms/Cross/plugins/DropPlugin/DropPlugin.h	2014-12-10 21:04:05 UTC (rev 3167)
@@ -9,4 +9,5 @@
 sqInt dropRequestFileHandle(sqInt dropIndex); /* return READ-ONLY file handle OOP or nilObject if error */
 sqInt sqSecFileAccessCallback(void *);
 void sqSetNumberOfDropFiles(sqInt numberOfFiles);
-void sqSetFileInformation(sqInt dropIndex, void *dropFile);void sqDragTriggerData(char *aByteArray, sqInt dataLength, char *aFormat, sqInt formatLength);
+void sqSetFileInformation(sqInt dropIndex, void *dropFile);
+void sqDragTriggerData(char *aByteArray, sqInt dataLength, char *aFormat, sqInt formatLength);

Modified: trunk/platforms/Cross/plugins/SoundGenerationPlugin/SoundGenerationPlugin.h
===================================================================
--- trunk/platforms/Cross/plugins/SoundGenerationPlugin/SoundGenerationPlugin.h	2014-12-10 20:28:32 UTC (rev 3166)
+++ trunk/platforms/Cross/plugins/SoundGenerationPlugin/SoundGenerationPlugin.h	2014-12-10 21:04:05 UTC (rev 3167)
@@ -1,6 +1,8 @@
 /* obsolete primitives for backward compatibility */
+#if OLD_SOUND_PRIMS
 int primFMSoundmixSampleCountintostartingAtpan(void);
 int oldprimSampledSoundmixSampleCountintostartingAtleftVolrightVol(void);
 int primPluckedSoundmixSampleCountintostartingAtpan(void);
 int primSampledSoundmixSampleCountintostartingAtpan(void);
 int primWaveTableSoundmixSampleCountintostartingAtpan(void);
+#endif /* OLD_SOUND_PRIMS */

Modified: trunk/platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
===================================================================
--- trunk/platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c	2014-12-10 20:28:32 UTC (rev 3166)
+++ trunk/platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c	2014-12-10 21:04:05 UTC (rev 3167)
@@ -2,16 +2,11 @@
 
 #include "sq.h"
 
+#if OLD_SOUND_PRIMS
 
-/* Memory Access Macros */
-#define byteAt(i) (*((unsigned char *) (i)))
-#define byteAtput(i, val) (*((unsigned char *) (i)) = val)
-#define longAt(i) (*((int *) (i)))
-#define longAtput(i, val) (*((int *) (i)) = val)
-
 /*** Imported Functions/Variables ***/
-extern int stackValue(int);
-extern int successFlag;
+extern sqInt stackValue(sqInt);
+extern sqInt successFlag;
 
 /*** Variables ***/
 
@@ -396,3 +391,4 @@
 	storeIntegerofObjectwithValue(12, rcvr, indexTimes1000);
 	pop(5);
 }
+#endif /* OLD_SOUND_PRIMS */


Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Thu Nov 13 14:36:11 PST 2014
   + Wed Dec 10 13:04:05 PST 2014



More information about the Vm-dev mailing list