From ee51436c9192c3494156aabe08cd0ac08676fa0c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 17 Jan 2002 01:25:37 +0000 Subject: [PATCH] Removed obsoleted code to work around a bug in gdk, at least version 1.3.12 of gtk is now required Organization: Straylight/Edgeware From: espen --- clg.system | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/clg.system b/clg.system index b72edc1..ccc8868 100644 --- a/clg.system +++ b/clg.system @@ -23,16 +23,6 @@ (defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir")) (defvar *cmucl-include-path* (ext:unix-namestring "target:lisp")) -;; A hack to get around a bug in gdk's init code -(defvar argc (make-alien c-call:int)) -(defvar progname (make-alien c-call:char)) -(defvar argv0 (make-alien (* c-call:char))) -(defvar argv (make-alien (* (* c-call:char)))) -(setf (deref argc) 1) -(setf (deref progname) 0) -(setf (deref argv0) progname) -(setf (deref argv) argv0) - ;; Without this, MAKE uses "CLG:glib;.err" as a namestring, which fails. ;; TODO: Find and fix the bug, then remove this. (setq mk::*cmu-errors-to-file* nil) @@ -41,9 +31,9 @@ `(mk:defsystem clg :initially-do (progn - (pkg-exists-p "glib-2.0" :atleast-version "1.3.9") - (pkg-exists-p "pango" :atleast-version "0.20") - (pkg-exists-p "gtk+-2.0" :atleast-version "1.3.9")) + (pkg-exists-p "glib-2.0" :atleast-version "1.3.12") + (pkg-exists-p "pango" :atleast-version "0.23") + (pkg-exists-p "gtk+-2.0" :atleast-version "1.3.12")) :source-pathname "clg:" :binary-pathname "clg:" :components @@ -90,8 +80,10 @@ (load-shared-library "libgdk-x11-1.3.so" :init "gdk_init" :prototype '(function - c-call:void (* c-call:int) (* (* (* char)))) - :initargs (list argc argv))) + c-call:void + system-area-pointer + system-area-pointer) + :initargs (list (system:int-sap 0) (system:int-sap 0)))) :language :c :source-extension "c" :binary-extension "o" -- [mdw]