--- hplip-3.10.9-orig/scan/sane/scl.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/scl.c	Fri Sep  4 01:06:47 2009

@@ -160,7 +160,7 @@

 }

-SANE_Status __attribute__ ((visibility ("hidden"))) SclSendCommand(int deviceid, int channelid, int cmd, int param)

+SANE_Status SclSendCommand(int deviceid, int channelid, int cmd, int param)

 {

     char buffer[LEN_SCL_BUFFER];

     int datalen, len;

@@ -208,7 +208,7 @@

     return SANE_STATUS_GOOD;

 }

-SANE_Status __attribute__ ((visibility ("hidden"))) SclInquire(int deviceid, int channelid, int cmd, int param, int * pValue, char * buffer, int maxlen)

+SANE_Status SclInquire(int deviceid, int channelid, int cmd, int param, int * pValue, char * buffer, int maxlen)

 {

     SANE_Status retcode;

     int lenResponse, len, value;

@@ -318,7 +318,7 @@

  * Phase 2 partial rewrite. des 9/26/07

  */

-SANE_Status __attribute__ ((visibility ("hidden"))) scl_send_cmd(HPAIO_RECORD *hpaio, const char *buf, int size)

+SANE_Status scl_send_cmd(HPAIO_RECORD *hpaio, const char *buf, int size)

 {

     int len;

@@ -336,7 +336,7 @@

     return SANE_STATUS_GOOD;

 }

-SANE_Status __attribute__ ((visibility ("hidden"))) scl_query_int(HPAIO_RECORD *hpaio, const char *buf, int size, int *result)

+SANE_Status scl_query_int(HPAIO_RECORD *hpaio, const char *buf, int size, int *result)

 {

     char rbuf[256];

     int len, stat;

--- hplip-3.10.9-orig/scan/sane/xml.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/xml.c	Fri Sep  4 01:07:00 2009

@@ -32,7 +32,7 @@

 #include <string.h>

 #include <stdlib.h>

-int __attribute__ ((visibility ("hidden"))) get_array_size(const char *tag)

+int get_array_size(const char *tag)

 {

    char *p, *tail;

@@ -43,7 +43,7 @@

 }

 /* Get xml element from the buffer. The returned element is zero terminated. */

-int __attribute__ ((visibility ("hidden"))) get_element(const char *buf, int buf_size, char *element, int element_size, char **tail)

+int get_element(const char *buf, int buf_size, char *element, int element_size, char **tail)

 {

    int i, j;

@@ -61,7 +61,7 @@

 }

 /* Get next xml tag from the buffer. The returned xml tag is zero terminated. */

-int __attribute__ ((visibility ("hidden"))) get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail)

+int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail)

 {

    int i=0, j=0, dd=0, lf=0;

--- hplip-3.10.9-orig/scan/sane/mfpdtf.h	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/mfpdtf.h	Fri Sep  4 01:05:54 2009

@@ -243,18 +243,18 @@

         } __attribute__(( packed) ) array;

 } __attribute__(( packed) );

-Mfpdtf_t __attribute__ ((visibility ("hidden"))) MfpdtfAllocate(int deviceid, int channelid);

-int __attribute__ ((visibility ("hidden"))) MfpdtfDeallocate(Mfpdtf_t mfpdtf);

-int __attribute__ ((visibility ("hidden"))) MfpdtfSetChannel(Mfpdtf_t mfpdtf, int channelid);

-int __attribute__ ((visibility ("hidden"))) MfpdtfLogToFile(Mfpdtf_t mfpdtf, char * filename);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetSimulateImageHeaders(Mfpdtf_t mfpdtf);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadSetSimulateImageHeaders(Mfpdtf_t mfpdtf, int simulateImageHeaders);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadStart(Mfpdtf_t mfpdtf);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadService(Mfpdtf_t mfpdtf);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetLastServiceResult(Mfpdtf_t mfpdtf);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetVariantHeader(Mfpdtf_t mfpdtf, union MfpdtfVariantHeader_u * buffer, int maxlen);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetStartPageRecord(Mfpdtf_t mfpdtf, struct MfpdtfImageStartPageRecord_s * buffer, int maxlen);

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadInnerBlock(Mfpdtf_t mfpdtf, unsigned char * buffer, int countdown);

+Mfpdtf_t MfpdtfAllocate(int deviceid, int channelid);

+int MfpdtfDeallocate(Mfpdtf_t mfpdtf);

+int MfpdtfSetChannel(Mfpdtf_t mfpdtf, int channelid);

+int MfpdtfLogToFile(Mfpdtf_t mfpdtf, char * filename);

+int MfpdtfReadGetSimulateImageHeaders(Mfpdtf_t mfpdtf);

+int MfpdtfReadSetSimulateImageHeaders(Mfpdtf_t mfpdtf, int simulateImageHeaders);

+int MfpdtfReadStart(Mfpdtf_t mfpdtf);

+int MfpdtfReadService(Mfpdtf_t mfpdtf);

+int MfpdtfReadGetLastServiceResult(Mfpdtf_t mfpdtf);

+int MfpdtfReadGetVariantHeader(Mfpdtf_t mfpdtf, union MfpdtfVariantHeader_u * buffer, int maxlen);

+int MfpdtfReadGetStartPageRecord(Mfpdtf_t mfpdtf, struct MfpdtfImageStartPageRecord_s * buffer, int maxlen);

+int MfpdtfReadInnerBlock(Mfpdtf_t mfpdtf, unsigned char * buffer, int countdown);

 /* 

  * Phase 2 rewrite. des

@@ -337,6 +337,6 @@

 #endif   // #if defined(WORDS_BIGENDIAN)

 #endif   // #if !defined(htole16)

-int __attribute__ ((visibility ("hidden"))) read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout);

+int read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout);

 #endif  // _MFPDTF_H

--- hplip-3.10.9-orig/scan/sane/io.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/io.c	Fri Sep  4 01:04:50 2009

@@ -43,7 +43,7 @@

 DBusError dbus_err;

 DBusConnection * dbus_conn;

-int __attribute__ ((visibility ("hidden"))) InitDbus(void)

+int InitDbus(void)

 {

    dbus_error_init(&dbus_err);

    dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_err);

@@ -62,7 +62,7 @@

    return 1;

 }

-int __attribute__ ((visibility ("hidden"))) SendScanEvent(char *device_uri, int event)

+int SendScanEvent(char *device_uri, int event)

 {

     DBusMessage * msg = dbus_message_new_signal(DBUS_PATH, DBUS_INTERFACE, "Event");

     char * printer = "";

@@ -104,11 +104,11 @@

     return 1;

 }

 #else

-int __attribute__ ((visibility ("hidden"))) InitDbus(void)

+int InitDbus(void)

 {

    return 1;

 }

-int __attribute__ ((visibility ("hidden"))) SendScanEvent(char *device_uri, int event)

+int SendScanEvent(char *device_uri, int event)

 {

     return 1;

 }

@@ -115,7 +115,7 @@

 #endif  /* HAVE_DBUS */

 /* Read full requested data length in BUFFER_SIZE chunks. Return number of bytes read. */

-int __attribute__ ((visibility ("hidden"))) ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout)

+int ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout)

 {

    int n, len, size, total=0;

    enum HPMUD_RESULT stat;

--- hplip-3.10.9-orig/scan/sane/common.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/common.c	Fri Sep  4 01:04:05 2009

@@ -35,7 +35,7 @@

 #define DEBUG_NOT_STATIC

 #include "sanei_debug.h"

-int __attribute__ ((visibility ("hidden"))) bug(const char *fmt, ...)

+int bug(const char *fmt, ...)

 {

    char buf[256];

    va_list args;

@@ -50,7 +50,7 @@

    return n;

 }

-void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size)

+void sysdump(const void *data, int size)

 {

     /* Dump size bytes of *data. Output looks like:

      * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9.

@@ -97,7 +97,7 @@

     }

 }

-void __attribute__ ((visibility ("hidden"))) bugdump(const void *data, int size)

+void bugdump(const void *data, int size)

 {

     /* Dump size bytes of *data. Output looks like:

      * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9.

@@ -144,7 +144,7 @@

     }

 }

-char __attribute__ ((visibility ("hidden"))) *psnprintf(char *buf, int bufSize, const char *fmt, ...)

+char *psnprintf(char *buf, int bufSize, const char *fmt, ...)

 {

    va_list args;

    int n;

@@ -159,7 +159,7 @@

    return buf;

 }

-unsigned long __attribute__ ((visibility ("hidden"))) DivideAndShift( int line,

+unsigned long DivideAndShift( int line,

                               unsigned long numerator1,

                               unsigned long numerator2,

                               unsigned long denominator,

@@ -182,12 +182,12 @@

     return result;

 }

-void __attribute__ ((visibility ("hidden"))) NumListClear( int * list )

+void NumListClear( int * list )

 {

     memset( list, 0, sizeof( int ) * MAX_LIST_SIZE );

 }

-int __attribute__ ((visibility ("hidden"))) NumListIsInList( int * list, int n )

+int NumListIsInList( int * list, int n )

 {

     int i;

     for( i = 1; i < MAX_LIST_SIZE; i++ )

@@ -200,7 +200,7 @@

     return 0;

 }

-int __attribute__ ((visibility ("hidden"))) NumListAdd( int * list, int n )

+int NumListAdd( int * list, int n )

 {

     if( NumListIsInList( list, n ) )

     {

@@ -215,12 +215,12 @@

     return 1;

 }

-int __attribute__ ((visibility ("hidden"))) NumListGetCount( int * list )

+int NumListGetCount( int * list )

 {

     return list[0];

 }

-int __attribute__ ((visibility ("hidden"))) NumListGetFirst( int * list )

+int NumListGetFirst( int * list )

 {

     int n = list[0];

     if( n > 0 )

@@ -230,12 +230,12 @@

     return n;

 }

-void __attribute__ ((visibility ("hidden"))) StrListClear( const char ** list )

+void StrListClear( const char ** list )

 {

     memset( list, 0, sizeof( char * ) * MAX_LIST_SIZE );

 }

-int __attribute__ ((visibility ("hidden"))) StrListIsInList( const char ** list, char * s )

+int StrListIsInList( const char ** list, char * s )

 {

     while( *list )

     {

@@ -248,7 +248,7 @@

     return 0;

 }

-int __attribute__ ((visibility ("hidden"))) StrListAdd( const char ** list, char * s )

+int StrListAdd( const char ** list, char * s )

 {

     int i;

     for( i = 0; i < MAX_LIST_SIZE - 1; i++ )

--- hplip-3.10.9-orig/scan/sane/pml.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/pml.c	Fri Sep  4 01:06:11 2009

@@ -36,7 +36,7 @@

 #define DEBUG_DECLARE_ONLY

 #include "sanei_debug.h"

-int __attribute__ ((visibility ("hidden"))) PmlSetID( PmlObject_t obj, char * oid )

+int PmlSetID( PmlObject_t obj, char * oid )

 {

     int len = 0;    /* TODO: Do we need this parameter? */

@@ -137,12 +137,12 @@

     return r;

 }

-int __attribute__ ((visibility ("hidden"))) PmlSetValue( PmlObject_t obj, int type, char * value, int len )

+int PmlSetValue( PmlObject_t obj, int type, char * value, int len )

 {

     return PmlSetPrefixValue( obj, type, 0, 0, value, len );

 }

-int __attribute__ ((visibility ("hidden"))) PmlSetIntegerValue( PmlObject_t obj, int type, int value )

+int PmlSetIntegerValue( PmlObject_t obj, int type, int value )

 {

     char buffer[sizeof( int )];

     int len = sizeof( int ), i = len - 1;

@@ -217,12 +217,12 @@

     return len;

 }

-int __attribute__ ((visibility ("hidden"))) PmlGetValue(PmlObject_t obj, int *pType, char *buffer, int maxlen)

+int PmlGetValue(PmlObject_t obj, int *pType, char *buffer, int maxlen)

 {

     return PmlGetPrefixValue( obj, pType, 0, 0, buffer, maxlen );

 }

-int __attribute__ ((visibility ("hidden"))) PmlGetStringValue( PmlObject_t obj,

+int PmlGetStringValue( PmlObject_t obj,

                            int * pSymbolSet,

                            char * buffer,

                            int maxlen )

@@ -248,7 +248,7 @@

     return len;

 }

-int __attribute__ ((visibility ("hidden"))) PmlGetIntegerValue( PmlObject_t obj, int * pType, int * pValue )

+int PmlGetIntegerValue( PmlObject_t obj, int * pType, int * pValue )

 {

     int type;

     unsigned char svalue[sizeof( int )];

@@ -289,7 +289,7 @@

     return obj->status;

 }

-int __attribute__ ((visibility ("hidden"))) PmlRequestSet( int deviceid, int channelid, PmlObject_t obj )

+int PmlRequestSet( int deviceid, int channelid, PmlObject_t obj )

 {

     unsigned char data[PML_MAX_DATALEN];

     int datalen=0, status=ERROR, type, result, pml_result;

@@ -308,7 +308,7 @@

     return status;  /* OK = valid I/O result */

 }

-int __attribute__ ((visibility ("hidden"))) PmlRequestSetRetry( int deviceid, int channelid, PmlObject_t obj, int count, int delay )

+int PmlRequestSetRetry( int deviceid, int channelid, PmlObject_t obj, int count, int delay )

 {

    int stat=ERROR, r;

@@ -346,7 +346,7 @@

    return stat;  /* OK = valid I/O result AND PML result */

 }

-int __attribute__ ((visibility ("hidden"))) PmlRequestGet( int deviceid, int channelid, PmlObject_t obj ) 

+int PmlRequestGet( int deviceid, int channelid, PmlObject_t obj ) 

 {

     unsigned char data[PML_MAX_DATALEN];

     int datalen=0, stat=ERROR, type, pml_result;

@@ -603,7 +603,7 @@

    return stat;

 }

-int __attribute__ ((visibility ("hidden"))) pml_start(HPAIO_RECORD *hpaio)

+int pml_start(HPAIO_RECORD *hpaio)

 {

    MFPDTF_FIXED_HEADER *ph;

    MFPDTF_START_PAGE *ps;

@@ -888,7 +888,7 @@

    return stat;

 }

-int __attribute__ ((visibility ("hidden"))) pml_read(HPAIO_RECORD *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength)

+int pml_read(HPAIO_RECORD *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength)

 {

    MFPDTF_RASTER *pd;

    int stat=SANE_STATUS_IO_ERROR;

@@ -1018,7 +1018,7 @@

     return stat;

 }

-int __attribute__ ((visibility ("hidden"))) pml_cancel(HPAIO_RECORD *hpaio)

+int pml_cancel(HPAIO_RECORD *hpaio)

 {

    int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0;

--- hplip-3.10.9-orig/scan/sane/hpaio.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/hpaio.c	Fri Sep  4 01:04:29 2009

@@ -324,7 +324,7 @@

     return NULL;

 }

-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneError( hpaioScanner_t hpaio )

+SANE_Status hpaioScannerToSaneError( hpaioScanner_t hpaio )

 {

     SANE_Status retcode;

@@ -438,7 +438,7 @@

 }

-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneStatus( hpaioScanner_t hpaio )

+SANE_Status hpaioScannerToSaneStatus( hpaioScanner_t hpaio )

 {

 //BREAKPOINT;

--- hplip-3.10.9-orig/scan/sane/xml.h	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/xml.h	Fri Sep  4 01:07:05 2009

@@ -27,10 +27,10 @@

 #ifndef _MXML_H

 #define _MXML_H

-int __attribute__ ((visibility ("hidden"))) get_array_size(const char *tag);

+int get_array_size(const char *tag);

 /* Get xml element from the buffer. The returned element is zero terminated. */

-int __attribute__ ((visibility ("hidden"))) get_element(const char *buf, int buf_size, char *element, int element_size, char **tail);

+int get_element(const char *buf, int buf_size, char *element, int element_size, char **tail);

 /* Get next xml tag from the buffer. The returned xml tag is zero terminated. */

-int __attribute__ ((visibility ("hidden"))) get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail);

+int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail);

 #endif  // _MXML_H

--- hplip-3.10.9-orig/scan/sane/scl.h	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/scl.h	Fri Sep  4 01:06:54 2009

@@ -176,8 +176,8 @@

 //#define LEN_SCL_BUFFER 1024

 #define LEN_SCL_BUFFER    256 /* Increase if reading binary data. */

-SANE_Status  __attribute__ ((visibility ("hidden"))) SclSendCommand(int deviceid, int channelid, int cmd, int param);

-SANE_Status __attribute__ ((visibility ("hidden"))) SclInquire(int deviceid, int channelid, int cmd, int param, int *pValue, char *buffer, int maxlen);

+SANE_Status  SclSendCommand(int deviceid, int channelid, int cmd, int param);

+SANE_Status SclInquire(int deviceid, int channelid, int cmd, int param, int *pValue, char *buffer, int maxlen);

 /*

  * Phase 2 partial rewrite. des 9/26/07

@@ -195,8 +195,8 @@

 struct hpaioScanner_s;

-SANE_Status __attribute__ ((visibility ("hidden"))) scl_send_cmd(struct hpaioScanner_s *hpaio, const char *buf, int size);

-SANE_Status __attribute__ ((visibility ("hidden"))) scl_query_int(struct hpaioScanner_s *hpaio, const char *buf, int size, int *result);

+SANE_Status scl_send_cmd(struct hpaioScanner_s *hpaio, const char *buf, int size);

+SANE_Status scl_query_int(struct hpaioScanner_s *hpaio, const char *buf, int size, int *result);

 #endif

--- hplip-3.10.9-orig/scan/sane/hpaio.h	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/hpaio.h	Fri Sep  4 01:04:35 2009

@@ -271,8 +271,8 @@

     } \

   } while(0)

-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneStatus( hpaioScanner_t hpaio );

-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneError( hpaioScanner_t hpaio );

+SANE_Status hpaioScannerToSaneStatus( hpaioScanner_t hpaio );

+SANE_Status hpaioScannerToSaneError( hpaioScanner_t hpaio );

 void sane_hpaio_cancel(SANE_Handle handle);

 #endif

--- hplip-3.10.9-orig/scan/sane/mfpdtf.c	Tue Aug  4 16:36:06 2009

+++ hplip-3.10.9/scan/sane/mfpdtf.c	Fri Sep  4 01:05:16 2009

@@ -56,7 +56,7 @@

     return seconds;

 }

-Mfpdtf_t __attribute__ ((visibility ("hidden"))) MfpdtfAllocate( int deviceid, int channelid )

+Mfpdtf_t MfpdtfAllocate( int deviceid, int channelid )

 {

     int size = sizeof( struct Mfpdtf_s );

     Mfpdtf_t mfpdtf = malloc( size );

@@ -74,7 +74,7 @@

     return mfpdtf;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfDeallocate( Mfpdtf_t mfpdtf )

+int MfpdtfDeallocate( Mfpdtf_t mfpdtf )

 {

     if( !mfpdtf )

     {

@@ -86,7 +86,7 @@

     return OK;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfSetChannel( Mfpdtf_t mfpdtf, int channelid )

+int MfpdtfSetChannel( Mfpdtf_t mfpdtf, int channelid )

 {

     mfpdtf->channelid = channelid;

     /* If necessary, we can query the device ID string using the

@@ -94,7 +94,7 @@

     return OK;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfLogToFile( Mfpdtf_t mfpdtf, char * filename )

+int MfpdtfLogToFile( Mfpdtf_t mfpdtf, char * filename )

 {

     if( mfpdtf->fdLog != -1 )

     {

@@ -114,12 +114,12 @@

     return OK;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetSimulateImageHeaders( Mfpdtf_t mfpdtf )

+int MfpdtfReadGetSimulateImageHeaders( Mfpdtf_t mfpdtf )

 {

     return mfpdtf->read.simulateImageHeaders;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadSetSimulateImageHeaders( Mfpdtf_t mfpdtf,

+int MfpdtfReadSetSimulateImageHeaders( Mfpdtf_t mfpdtf,

                                        int simulateImageHeaders )

 {

     mfpdtf->read.simulateImageHeaders = simulateImageHeaders;

@@ -126,7 +126,7 @@

     return simulateImageHeaders;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadStart( Mfpdtf_t mfpdtf )

+int MfpdtfReadStart( Mfpdtf_t mfpdtf )

 {

     mfpdtf->read.lastServiceResult = 0;

     mfpdtf->read.dataType = ERROR;

@@ -206,7 +206,7 @@

     return r;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadService( Mfpdtf_t mfpdtf )

+int MfpdtfReadService( Mfpdtf_t mfpdtf )

 {

     int result = 0;

     int datalen, blockLength, headerLength;

@@ -408,12 +408,12 @@

     RETURN( ( result | mfpdtf->read.fixedHeader.pageFlags ) );

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetLastServiceResult( Mfpdtf_t mfpdtf )

+int MfpdtfReadGetLastServiceResult( Mfpdtf_t mfpdtf )

 {

     return mfpdtf->read.lastServiceResult;

 }

-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetVariantHeader( Mfpdtf_t mfpdtf,

+int MfpdtfReadGetVariantHeader( Mfpdtf_t mfpdtf,

                                 union MfpdtfVariantHeader_u * buffer,

                                 int maxlen )

 {

@@ -433,7 +433,7 @@

     return maxlen;

 }