Merge devel (v1.0.3) into head branch.

include/sane/sanei_backend.h

@@ -8,6 +8,7 @@
 # define HAVE_IOPERM    1
 #endif
 
+#ifndef HAVE_OS2_H
 #ifndef O_NONBLOCK
 # ifdef O_NDELAY
 #  define O_NONBLOCK O_NDELAY
@@ -15,21 +16,7 @@
 #  define O_NONBLOCK FNDELAY    /* last resort */
 # endif
 #endif
-
-#ifndef __GLIBC__
-# ifndef u_int8_t
-#  define u_int8_t      u_int8_t
-typedef unsigned char   u_int8_t;
-# endif
-# ifndef u_int16_t
-#  define u_int16_t	u_int16_t
-typedef unsigned short  u_int16_t;
-# endif
-# ifndef u_int32_t
-#  define u_int32_t	u_int32_t
-typedef unsigned int    u_int32_t;
-# endif
-#endif
+#endif /* HAVE_OS2_H */
 
 #ifdef HAVE_SIGPROCMASK
 # define SIGACTION      sigaction