[Vm-dev] [commit][3242] Eliminate some 64-bit warnings for the
Mpeg3Plugin (i.e.
commits at squeakvm.org
commits at squeakvm.org
Sat Jan 31 01:22:54 UTC 2015
Revision: 3242
Author: eliot
Date: 2015-01-30 17:22:54 -0800 (Fri, 30 Jan 2015)
Log Message:
-----------
Eliminate some 64-bit warnings for the Mpeg3Plugin (i.e. provide a def of
memoryAllocate in a place where it is seen).
ELiminate an unused var warning in sqOpenGLRenderer.c
Modified Paths:
--------------
trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c
trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h
trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h
Property Changed:
----------------
trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
Modified: trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c
===================================================================
--- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2015-01-31 01:17:30 UTC (rev 3241)
+++ trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2015-01-31 01:22:54 UTC (rev 3242)
@@ -808,7 +808,9 @@
B3DInputFace *facePtr = (B3DInputFace*) idxArray;
GLuint tracking;
int nVertices = vtxSize;
+#ifndef GL_VERSION_1_1
int nFaces = 0;
+#endif
int i, vtxFlags;
struct glRenderer *renderer = glRendererFromHandle(handle);
Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h 2015-01-31 01:17:30 UTC (rev 3241)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h 2015-01-31 01:22:54 UTC (rev 3242)
@@ -1,4 +1,2 @@
#include "mpeg3private.h"
int mpeg3_generate_toc_for_Squeak(mpeg3_t *file, int timecode_search, int print_streams, char *buffer, int buffer_size);
-void * memoryAllocate(int number,unsigned size);
-void memoryFree(void *stuff);
Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h
===================================================================
--- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h 2015-01-31 01:17:30 UTC (rev 3241)
+++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h 2015-01-31 01:22:54 UTC (rev 3242)
@@ -1,9 +1,12 @@
- /* Changed Sept 15th by John M McIntosh to support Macintosh & Squeak
+/* Changed Sept 15th by John M McIntosh to support Macintosh & Squeak
+ * Changed 2015/1/30 by Eliot Miranda to include memoryAllocate/memoryFree decls
*/
#ifndef MPEG3PRIVATE_H
#define MPEG3PRIVATE_H
+void * memoryAllocate(int number,unsigned size);
+void memoryFree(void *stuff);
/** configuration **/
#if defined(__MWERKS__)
Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Thu Jan 29 14:46:37 PST 2015
+ Fri Jan 30 17:22:45 PST 2015
More information about the Vm-dev
mailing list