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

Fixed some compilation errors on Darwin and OS/2.

merge-requests/1/head
Gerhard Jaeger 2003-10-10 06:57:36 +00:00
rodzic 6e8bd98ef6
commit 73caefebca
2 zmienionych plików z 12 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2003-10-10 Gerhard Jaeger <gerhard@gjaeger.de>
* sanei/sanei_thread.c: Fixed some compilation errors on Darwin and OS/2
2003-10-09 Peter Kirchgessner <peter@kirchgessner.net> 2003-10-09 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.c backend/hp-option.c backend/hp-scl.c: * backend/hp.c backend/hp-option.c backend/hp-scl.c:
@ -10,7 +14,7 @@
* backend/umax_pp.c backend/umax_pp_low.h backend/umax_pp.h * backend/umax_pp.c backend/umax_pp_low.h backend/umax_pp.h
backend/umax_pp_mid.c backend/umax_pp_low.c backend/umax_pp_mid.h backend/umax_pp_mid.c backend/umax_pp_low.c backend/umax_pp_mid.h
backend/umax_pp.conf: added automatic parallel port detection, backend/umax_pp.conf: added automatic parallel port detection,
and special keyword in configuration file to use it. and special keyword in configuration file to use it.
2003-10-08 Gerhard Jaeger <gerhard@gjaeger.de> 2003-10-08 Gerhard Jaeger <gerhard@gjaeger.de>

9
sanei/sanei_thread.c
Wyświetl plik

@ -90,7 +90,7 @@ sanei_thread_init( void )
* *
*/ */
int int
sanei_thread_begin( void (*func)(void *args), void* args ) sanei_thread_begin( int (*func)(void *args), void* args )
{ {
return _beginthread( func, NULL, 1024*1024, args ); return _beginthread( func, NULL, 1024*1024, args );
} }
@ -104,7 +104,7 @@ sanei_thread_kill( int pid )
int int
sanei_thread_waitpid( int pid, int *status ) sanei_thread_waitpid( int pid, int *status )
{ {
if (status if (status)
*status = 0; *status = 0;
return pid; /* DosWaitThread( (TID*) &pid, DCWW_WAIT);*/ return pid; /* DosWaitThread( (TID*) &pid, DCWW_WAIT);*/
} }
@ -132,6 +132,11 @@ sanei_thread_get_status( int pid )
#ifdef USE_PTHREAD #ifdef USE_PTHREAD
/* seems to be undefined in MacOS X */
#ifndef PTHREAD_CANCELED
# define PTHREAD_CANCELED ((void *) -1)
#endif
typedef struct { typedef struct {
int (*func)( void* ); int (*func)( void* );