Move define-enumeration into util module.

1 files changed, 2 insertions, 16 deletions

diff --git a/2d/wrappers/freeimage.scm b/2d/wrappers/freeimage.scm
index ab037d4..3192dbb 100644
--- a/2d/wrappers/freeimage.scm
+++ b/2d/wrappers/freeimage.scm
@@ -22,7 +22,8 @@
 ;;; Code:
 
 (define-module (2d wrappers freeimage)
-  #:use-module (system foreign))
+  #:use-module (system foreign)
+  #:use-module (2d wrappers util))
 
 (define libfreeimage (dynamic-link "libfreeimage"))
 
@@ -30,21 +31,6 @@
   (define name
     (pointer->procedure ret (dynamic-func string-name libfreeimage) args)))
 
-;; Borrowed from guile-figl
-(define-syntax-rule (define-enumeration enumerator (name value) ...)
-  (define-syntax enumerator
-    (lambda (x)
-      (syntax-case x ()
-        ((_)
-         #''(name ...))
-        ((_ enum) (number? (syntax->datum #'enum))
-         #'enum)
-        ((_ enum)
-         (or (assq-ref '((name . value) ...)
-                       (syntax->datum #'enum))
-             (syntax-violation 'enumerator "invalid enumerated value"
-                               #'enum)))))))
-
 (define (number->boolean n)
   (not (zero? n)))