Re: C++ comments in snapscan (Was: Feature freeze for 1.0.3)

From: Petter Reinholdtsen (pere@hungry.com)
Date: Thu Jul 13 2000 - 11:22:11 PDT

  • Next message: Oliver Rauch: "Re: scanimage feature request (patch available)"

    > and I receive errors like
    >
    > In file included from snapscan.c:234:
    > snapscan-scsi.c:55: parse error before `/'

    I suggest this patch to fix it.

    Index: backend/snapscan.c
    ===================================================================
    RCS file: /cvsroot/external/sane/backend/snapscan.c,v
    retrieving revision 1.1.1.1.2.2
    diff -w -u -r1.1.1.1.2.2 snapscan.c
    --- snapscan.c 2000/07/13 04:47:46 1.1.1.1.2.2
    +++ snapscan.c 2000/07/13 18:17:58
    @@ -235,7 +235,9 @@
     #include <snapscan-sources.c>
     
     /* Remove comment from following line to enable USB instead of SCSI */
    -// #include "snapscan-usb.c"
    +#if USE_SNAPSCAN_USB
    +# include "snapscan-usb.c"
    +#endif
     
     static size_t max_string_size(SANE_String_Const strings[]);
     
    Index: backend/snapscan-scsi.c
    ===================================================================
    RCS file: /cvsroot/external/sane/backend/snapscan-scsi.c,v
    retrieving revision 1.1.2.2
    diff -w -u -r1.1.2.2 snapscan-scsi.c
    --- snapscan-scsi.c 2000/07/13 04:47:44 1.1.2.2
    +++ snapscan-scsi.c 2000/07/13 18:18:01
    @@ -52,7 +52,9 @@
     /* scanner scsi commands */
     
     /* Remove comment from following line to use USB instead of SCSI */
    -// #include "snapscan-usb.h"
    +#if USING_SNAPSCAN_USB
    +# include "snapscan-usb.h"
    +#endif
     
     /* a sensible sense handler, courtesy of Franck;
        the last argument is expected to be a pointer to the associated 

    -- 
##>  Petter Reinholdtsen  <##  |  pere@td.org.uit.no

    --
Source code, list archive, and docs: http://www.mostang.com/sane/
To unsubscribe: echo unsubscribe sane-devel | mail majordomo@mostang.com

    This archive was generated by hypermail 2b29 : Thu Jul 13 2000 - 11:00:18 PDT