From 873f2b61eea29d7d2f9083cd32d08adabb1fc80b Mon Sep 17 00:00:00 2001 From: Dmitry Kalyanov Date: Fri, 7 Aug 2009 23:28:24 +0400 Subject: [PATCH] glib: Changed generated-c{struct,union}-name to generate the same names every times (fixes loading of compiled fasls) --- glib/gobject.boxed.lisp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/glib/gobject.boxed.lisp b/glib/gobject.boxed.lisp index 661aa6c..6ab321c 100644 --- a/glib/gobject.boxed.lisp +++ b/glib/gobject.boxed.lisp @@ -336,19 +336,11 @@ :structure (parse-variant-structure-definition variant-name slots parent))) (collect variant))) -(defpackage :gobject.boxed.generated-names) - (defun generated-cstruct-name (symbol) - (or (get symbol 'generated-cstruct-name) - (setf (get symbol 'generated-cstruct-name) (gentemp (format nil "CSTRUCT-~A" (symbol-name symbol)) (find-package :gobject.boxed.generated-names))))) + (intern (format nil "~A-CSTRUCT-GENERATED-BY-GOBJECT-BOXED" (symbol-name symbol)) (symbol-package symbol))) (defun generated-cunion-name (symbol) - (or (get symbol 'generated-cunion-name) - (setf (get symbol 'generated-cunion-name) (gentemp (format nil "CUNION-~A" (symbol-name symbol)) (find-package :gobject.boxed.generated-names))))) - -(defun generated-fn-name (symbol) - (or (get symbol 'generated-fn-name) - (setf (get symbol 'generated-fn-name) (gentemp (format nil "FN~A" (symbol-name symbol)) (find-package :gobject.boxed.generated-names))))) + (intern (format nil "~A-CUNION-GENERATED-BY-GOBJECT-BOXED" (symbol-name symbol)) (symbol-package symbol))) (defun generate-cstruct-1 (struct) `(defcstruct ,(generated-cstruct-name (cstruct-description-name struct)) -- 1.7.10.4