X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/b2983f3591981a916f748362d91ff0e2817552cb..ae7a3c8fb42e457933efbbb9127d5a745096825a:/src/builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index 563766c..c7cb148 100644
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -85,6 +85,9 @@
 (define-class-slot "initsz" (class) size-t
   (format nil "sizeof(struct ~A)" (ilayout-struct-tag class)))
 
+(define-class-slot "align" (class) size-t
+  (format nil "SOD__ALIGNOF(struct ~A)" (ilayout-struct-tag class)))
+
 (define-class-slot "imprint" (class stream)
     (* (fun (* void) ("/*p*/" (* void))))
   (format nil "~A__imprint" class)
@@ -542,7 +545,7 @@ static const SodClass *const ~A__cpl[] = {
       (add-to-module module class))))
 
 (export '*builtin-module*)
-(defvar *builtin-module* nil
+(defvar-unbound *builtin-module*
   "The builtin module.")
 
 (export 'make-builtin-module)
@@ -561,8 +564,6 @@ static const SodClass *const ~A__cpl[] = {
 						    :case :common)
 			       :state nil)))
     (with-module-environment (module)
-      (dolist (name '("va_list" "size_t" "ptrdiff_t" "wchar_t"))
-	(add-to-module module (make-instance 'type-item :name name)))
       (flet ((header-name (name)
 	       (concatenate 'string "\"" (string-downcase name) ".h\""))
 	     (add-includes (reason &rest names)
@@ -581,6 +582,6 @@ static const SodClass *const ~A__cpl[] = {
     (setf *builtin-module* module)))
 
 (define-clear-the-decks builtin-module
-  (unless *builtin-module* (make-builtin-module)))
+  (unless (boundp '*builtin-module*) (make-builtin-module)))
 
 ;;;----- That's all, folks --------------------------------------------------