From 07a22cd39fe1e22451ed5032bb24181d8a41953f Mon Sep 17 00:00:00 2001 From: Peter Kirchgessner Date: Mon, 4 Oct 2004 18:09:05 +0000 Subject: [PATCH] Rename global function hp_init_openfd to sanei_hp_init_openfd --- backend/hp-scl.c | 5 ++++- backend/hp.c | 5 ++++- backend/hp.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/hp-scl.c b/backend/hp-scl.c index 7469bb208..9f0d14089 100644 --- a/backend/hp-scl.c +++ b/backend/hp-scl.c @@ -44,6 +44,9 @@ /* $Log$ + Revision 1.14 2004/10/04 18:09:05 kig-guest + Rename global function hp_init_openfd to sanei_hp_init_openfd + Revision 1.13 2004/03/27 13:52:39 kig-guest Keep USB-connection open (was problem with Linux 2.6.x) @@ -142,7 +145,7 @@ typedef struct /* Initialize structure where we remember out open file descriptors */ void -hp_init_openfd () +sanei_hp_init_openfd () {int iCount; memset (asHpOpenFd, 0, sizeof (asHpOpenFd)); diff --git a/backend/hp.c b/backend/hp.c index e95e70446..b33b275a5 100644 --- a/backend/hp.c +++ b/backend/hp.c @@ -49,6 +49,9 @@ static char *hp_backend_revision = "$Revision$"; V 1.06: $Log$ + Revision 1.21 2004/10/04 18:09:05 kig-guest + Rename global function hp_init_openfd to sanei_hp_init_openfd + Revision 1.20 2004/03/27 13:52:39 kig-guest Keep USB-connection open (was problem with Linux 2.6.x) @@ -809,7 +812,7 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback UNUSEDARG authorize) DBG(3, "sane_init called\n"); sanei_thread_init (); - hp_init_openfd (); + sanei_hp_init_openfd (); hp_destroy(); if (version_code) diff --git a/backend/hp.h b/backend/hp.h index 705437e78..c4bcc7c73 100644 --- a/backend/hp.h +++ b/backend/hp.h @@ -164,7 +164,7 @@ typedef int HpScl; typedef long int HpScl; #endif -void hp_init_openfd (void); +void sanei_hp_init_openfd (void); typedef struct {