[Vm-dev] [commit][3662]
Fix compiling the UUIDPlgin external on win32 under the new build regime.
commits at squeakvm.org
commits at squeakvm.org
Tue Mar 29 02:46:29 UTC 2016
Revision: 3662
Author: eliot
Date: 2016-03-28 19:46:26 -0700 (Mon, 28 Mar 2016)
Log Message:
-----------
Fix compiling the UUIDPlgin external on win32 under the new build regime.
Modified Paths:
--------------
trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c
Added Paths:
-----------
trunk/platforms/win32/plugins/UUIDPlugin/Makefile.plugin
Added: trunk/platforms/win32/plugins/UUIDPlugin/Makefile.plugin
===================================================================
--- trunk/platforms/win32/plugins/UUIDPlugin/Makefile.plugin (rev 0)
+++ trunk/platforms/win32/plugins/UUIDPlugin/Makefile.plugin 2016-03-29 02:46:26 UTC (rev 3662)
@@ -0,0 +1,3 @@
+include ../common/Makefile.plugin
+
+EXTRALIBS:=-lole32
Modified: trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c
===================================================================
--- trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c 2016-03-28 22:36:02 UTC (rev 3661)
+++ trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c 2016-03-29 02:46:26 UTC (rev 3662)
@@ -12,17 +12,24 @@
#include <ole2.h>
#include "sq.h"
-int sqUUIDInit(void) {
- return 1;
-}
+int
+sqUUIDInit(void) { return 1; }
-int sqUUIDShutdown(void) {
- return 1;
-}
+int
+sqUUIDShutdown(void) { return 1; }
-int MakeUUID(char *location) {
- if(CoCreateGuid((GUID*)location) == S_OK) return 1;
- primitiveFail();
- return 0;
+#if defined(SQUEAK_BUILTIN_PLUGIN)
+# define FAIL() primitiveFail()
+#else
+extern struct VirtualMachine *interpreterProxy;
+# define FAIL() interpreterProxy->primitiveFail()
+#endif
+
+int
+MakeUUID(char *location) {
+ if (CoCreateGuid((GUID*)location) == S_OK)
+ return 1;
+ FAIL();
+ return 0;
}
More information about the Vm-dev
mailing list