kopia lustrzana https://gitlab.com/sane-project/backends
Use local assert.h file to fix problems with AIX and shared libraries.
Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
rodzic
d6adc10238
commit
7716aa8409
|
@ -0,0 +1,39 @@
|
|||
/* sane - Scanner Access Now Easy.
|
||||
Copyright (C) 2001 by Henning Meier-Geinitz
|
||||
Based on gcc header file assert.h.
|
||||
This file is part of the SANE package.
|
||||
|
||||
SANE is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free
|
||||
Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
SANE is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with sane; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
Choose suitable implementation of assert.
|
||||
*/
|
||||
|
||||
#ifndef lassert_h
|
||||
#define lassert_h
|
||||
|
||||
|
||||
#if defined __GNUC__ && defined _AIX
|
||||
/* The implementation of assert of gcc on AIX is in libgcc.a. This
|
||||
doesn't work with shared libraries. So let's make our own assert(). */
|
||||
#define assert(arg) \
|
||||
((void) ((arg) ? 0 : lassert (arg, __FILE__, __LINE__)))
|
||||
#define lassert(arg, file, lineno) \
|
||||
(printf ("%s:%u: failed assertion\n", file, lineno), \
|
||||
abort (), 0)
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#endif /* lassert_h */
|
|
@ -41,13 +41,13 @@
|
|||
This file provides a generic SCSI interface. */
|
||||
|
||||
#ifdef _AIX
|
||||
# include <lalloca.h> /* MUST come first for AIX! */
|
||||
# include "../include/lalloca.h" /* MUST come first for AIX! */
|
||||
#endif
|
||||
|
||||
#include "sane/config.h"
|
||||
#include <lalloca.h>
|
||||
#include "../include/sane/config.h"
|
||||
#include "../include/lalloca.h"
|
||||
#include "../include/lassert.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
@ -184,12 +184,12 @@
|
|||
# define USE STUBBED_INTERFACE
|
||||
#endif
|
||||
|
||||
#include "sane/sanei.h"
|
||||
#include "sane/sanei_config.h"
|
||||
#include "sane/sanei_scsi.h"
|
||||
#include "../include/sane/sanei.h"
|
||||
#include "../include/sane/sanei_config.h"
|
||||
#include "../include/sane/sanei_scsi.h"
|
||||
|
||||
#define BACKEND_NAME sanei_scsi
|
||||
#include "sane/sanei_debug.h"
|
||||
#include "../include/sane/sanei_debug.h"
|
||||
|
||||
#if USE == DECUNIX_INTERFACE
|
||||
static int cam_fd = -1; /* used for SCSI CAM based interfaces */
|
||||
|
|
Ładowanie…
Reference in New Issue