Revision: 2906
Author: eliot
Date: 2014-04-28 16:39:31 -0700 (Mon, 28 Apr 2014)
Log Message:
-----------
sqUnixX11.c:
Include the right X11 include file to pull in the def for XK_equal
(keysym.h vs keysymdef.h).
Don't define BytesPerOop or BaseHeaderSize; these should be taken from interp.h.
Add the XDisplayControlPlugin to the plugins loaded by the image build script.
Modified Paths:
--------------
branches/Cog/image/BuildSqueak45Image.st
branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/image/BuildSqueak45Image.st
===================================================================
--- branches/Cog/image/BuildSqueak45Image.st 2014-04-28 19:25:13 UTC (rev 2905)
+++ branches/Cog/image/BuildSqueak45Image.st 2014-04-28 23:39:31 UTC (rev 2906)
@@ -9,7 +9,8 @@
('
http://www.squeaksource.com/OSProcess' 4 ('OSProcess'))
('
http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog'))
('
http://www.squeaksource.com/rb' 5 ('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment'))
- ('
http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))).
+ ('
http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))
+ ('
http://www.squeaksource.com/XDCP' 9 ('VMConstruction-Plugins-XDisplayControlPlugin' ))).
load := (manifest collect:
[:tuple|
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Apr 28 12:20:13 PDT 2014
+ Mon Apr 28 16:37:33 PDT 2014
Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
===================================================================
--- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-04-28 19:25:13 UTC (rev 2905)
+++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-04-28 23:39:31 UTC (rev 2906)
@@ -113,7 +113,7 @@
#include <X11/Xatom.h>
#define XK_MISCELLANY
#define XK_XKB_KEYS
-#include <X11/keysymdef.h>
+#include <X11/keysym.h> /* /not/ keysymdef.h */
#if defined(SUGAR)
# include <X11/XF86keysym.h>
#endif
@@ -138,16 +138,6 @@
#define isAligned(T, V) (((V) % sizeof(T)) == 0)
#define align(T, V) (((V) / sizeof(T)) * sizeof(T))
-#if defined(SQ_IMAGE32)
-# define BytesPerOop 4
-#elif defined(SQ_IMAGE64)
-# define BytesPerOop 8
-#else
-# error cannot determine image word size
-#endif
-
-#define BaseHeaderSize BytesPerOop
-
/*** Variables -- Imported from Virtual Machine ***/
/*** Variables -- X11 Related ***/
Locked
