From ae35d558dc37a1aca99e14c6e4a7b3fe32eadcdf Mon Sep 17 00:00:00 2001
From: Frank Zago <fzago@austin.rr.com>
Date: Sat, 13 Nov 2004 20:29:14 +0000
Subject: [PATCH] Move __unused__ definition from sane.h to sanei_backend.h.
 Fixed a typo in sanei_backend.h.

---
 include/sane/sane.h          | 16 ----------------
 include/sane/sanei_backend.h | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/sane/sane.h b/include/sane/sane.h
index 918263442..26dd18525 100644
--- a/include/sane/sane.h
+++ b/include/sane/sane.h
@@ -20,22 +20,6 @@
 extern "C" {
 #endif
 
-/*
- * Compiler related options
- */
-
-#ifdef __GNUC__
-
-/* __unused tells the compiler a variable is unused, so the
- * compiler doesn't spit a warning. */
-#define __unused__ __attribute__((unused))
-
-#else
-
-#define __unused__
-
-#endif
-
 /*
  * SANE types and defines
  */
diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
index cf37ff713..09820e6f5 100644
--- a/include/sane/sanei_backend.h
+++ b/include/sane/sanei_backend.h
@@ -2,7 +2,7 @@
  * Compatibility header file for backends
  *
  * This file provides some defines for macros missing on some platforms.
- * It also has the SANE API entry points. sanei_backend.h muste be included
+ * It also has the SANE API entry points. sanei_backend.h must be included
  * by every backend.
  *
  * @sa sanei.h sanei_thread.h
@@ -12,6 +12,22 @@
  * @{
  */
 
+/*
+ * Compiler related options
+ */
+
+#ifdef __GNUC__
+
+/* __unused tells the compiler a variable is unused, so the
+ * compiler doesn't spit a warning. */
+#define __unused__ __attribute__((unused))
+
+#else
+
+#define __unused__
+
+#endif
+
 #include <sane/sanei_debug.h>
 
 #ifdef HAVE_SYS_HW_H