[Better maybe-define-FOO
clinton@unknownlamer.org**20091028184347
 Ignore-this: c945b3efaefab67bedb4aadafaffa222
 * Test for symbol boundness in the macro at compile time rather than
   unconditionally defining and setting value to `*unspecified*'
] hunk ./errno.scm 13
-    `(begin (define ,scsh-name ,(and (defined? `,value)
-				     value))
-	    (export ,scsh-name))))
+    (if (defined? value)
+	`(begin (define ,scsh-name ,value)
+		(export ,scsh-name))
+	`(begin))))
hunk ./netconst.scm 7
-  `(begin
-     (define ,name (and (defined? ',value) ,value))
-     (export ,name)))
+  (if (defined? value)
+      `(begin
+	 (define ,name ,value)
+	 (export ,name))
+      `(begin)))
+
hunk ./netconst.scm 17
-    `(begin
-       (define ,name (and (defined? ',value) ,value))
-       (export ,name)
-       (set! ,type-var (cons (and (defined? ',value) ,value)
-			     ,type-var)))))
+    (if (defined? value)
+	`(begin
+	   (define ,name ,value)
+	   (export ,name)
+	   (set! ,type-var (cons ,value ,type-var)))
+	`(begin))))
hunk ./sighandlers.scm 105
-    `(begin
-       (define ,interrupt-name ,(and (defined? `,name) name))
-       (export ,interrupt-name)
-       (define ,signal-name ,(and (defined? `,name)  name))
-       (export ,signal-name))))
+    (if (defined? name)
+	`(begin
+	   (define ,interrupt-name ,name)
+	   (export ,interrupt-name)
+	   (define ,signal-name ,name)
+	   (export ,signal-name)))))