mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed compilation problem in snapscan backend on OS/2

merge-requests/1/head
Oliver Schwartz 2004-04-15 20:33:53 +00:00
rodzic 41b72dc6e6
commit 1664d516d8
4 zmienionych plików z 12 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2004-04-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-mutex.c: Fixed compilation problem on OS/2
(Thanks to Franz Bakan).
* configure.in configure: SnapScan backend now compiled in by
default on OS/2
2004-04-15 Marian Eichholz <eichholz@computer.org> 2004-04-15 Marian Eichholz <eichholz@computer.org>
* backend/sm3600.h backend/sm3600-scanmtek.c * backend/sm3600.h backend/sm3600-scanmtek.c

6
backend/snapscan-mutex.c
Wyświetl plik

@ -39,7 +39,7 @@
whether to permit this exception to apply to your modifications. whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.*/ If you do not wish that, delete this exception notice.*/
#if defined USE_PTHREAD #if defined USE_PTHREAD || defined HAVE_OS2_H
#include <pthread.h> #include <pthread.h>
#define snapscan_mutex_t pthread_mutex_t #define snapscan_mutex_t pthread_mutex_t
@ -65,7 +65,7 @@ static void snapscani_mutex_unlock(snapscan_mutex_t* sem_id)
pthread_mutex_unlock(sem_id); pthread_mutex_unlock(sem_id);
} }
#else /* defined USE_PTHREAD */ #else /* defined USE_PTHREAD || defined HAVE_OS2_H */
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/sem.h> #include <sys/sem.h>
@ -115,4 +115,4 @@ static void snapscani_mutex_unlock(snapscan_mutex_t* sem_id)
semop(*sem_id, &sem_signal, 1); semop(*sem_id, &sem_signal, 1);
} }
#endif /* defined USE_PTHREAD */ #endif /* defined USE_PTHREAD || defined HAVE_OS2_H */

8
configure vendored
Wyświetl plik

@ -23873,7 +23873,7 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
microtek2 mustek mustek_pp mustek_usb nec pie plustek \ microtek2 mustek mustek_pp mustek_usb nec pie plustek \
plustek_pp ricoh s9036 sceptre sharp \ plustek_pp ricoh s9036 sceptre sharp \
sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \ sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
artec_eplus48u ma1509 ibm hp5400 u12" artec_eplus48u ma1509 ibm hp5400 u12 snapscan"
if test "${sane_cv_use_libjpeg}" != "yes"; then if test "${sane_cv_use_libjpeg}" != "yes"; then
echo "*** disabling DC210 backend (failed to find JPEG library)" echo "*** disabling DC210 backend (failed to find JPEG library)"
@ -23928,12 +23928,6 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
BACKENDS="${BACKENDS} net" BACKENDS="${BACKENDS} net"
fi fi
if test "${ac_cv_header_sys_sem_h}" = "no" ; then
echo "*** disabling snapscan backend (sys/sem.h not found)"
else
BACKENDS="${BACKENDS} snapscan"
fi
# Check whether --enable-pnm-backend or --disable-pnm-backend was given. # Check whether --enable-pnm-backend or --disable-pnm-backend was given.
if test "${enable_pnm_backend+set}" = set; then if test "${enable_pnm_backend+set}" = set; then
enableval="$enable_pnm_backend" enableval="$enable_pnm_backend"

8
configure.in
Wyświetl plik

@ -289,7 +289,7 @@ else
microtek2 mustek mustek_pp mustek_usb nec pie plustek \ microtek2 mustek mustek_pp mustek_usb nec pie plustek \
plustek_pp ricoh s9036 sceptre sharp \ plustek_pp ricoh s9036 sceptre sharp \
sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \ sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
artec_eplus48u ma1509 ibm hp5400 u12" artec_eplus48u ma1509 ibm hp5400 u12 snapscan"
if test "${sane_cv_use_libjpeg}" != "yes"; then if test "${sane_cv_use_libjpeg}" != "yes"; then
echo "*** disabling DC210 backend (failed to find JPEG library)" echo "*** disabling DC210 backend (failed to find JPEG library)"
@ -344,12 +344,6 @@ else
BACKENDS="${BACKENDS} net" BACKENDS="${BACKENDS} net"
fi fi
if test "${ac_cv_header_sys_sem_h}" = "no" ; then
echo "*** disabling snapscan backend (sys/sem.h not found)"
else
BACKENDS="${BACKENDS} snapscan"
fi
AC_ARG_ENABLE(pnm-backend, AC_ARG_ENABLE(pnm-backend,
AC_HELP_STRING([--enable-pnm-backend], AC_HELP_STRING([--enable-pnm-backend],
[enable the pnm backend for testing frontends (possible [enable the pnm backend for testing frontends (possible