gnokii/common gnokii.pc.in, 1.3, 1.4 gsm-encoding.c, 1.49, 1.50 readmidi.c, 1.3, 1.4

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/common
In directory subversions:/tmp/cvs-serv12313/common

Modified Files:
        gnokii.pc.in gsm-encoding.c readmidi.c 
Log Message:
mainly iconv related portability fixes


Index: gsm-encoding.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/gsm-encoding.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** gsm-encoding.c      20 Oct 2003 00:42:22 -0000      1.49
--- gsm-encoding.c      3 Nov 2003 21:16:39 -0000       1.50
***************
*** 39,43 ****
  #include "gnokii-internal.h"
  
! #ifdef HAVE_ICONV
  #  include <iconv.h>
  #  include <langinfo.h>
--- 39,43 ----
  #include "gnokii-internal.h"
  
! #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
  #  include <iconv.h>
  #  include <langinfo.h>
***************
*** 557,561 ****
        char *pin, *pout;
  
! #ifdef HAVE_ICONV
        iconv_t cd;
  
--- 557,561 ----
        char *pin, *pout;
  
! #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
        iconv_t cd;
  
***************
*** 568,572 ****
        *pout = 0;
  #else
! #     error "iconv missing"
  #endif
        return (nconv < 0) ?  -1 : pout - outstring;
--- 568,586 ----
        *pout = 0;
  #else
!       nconv = 0;
!       pin = (char *)instring;
!       pout = outstring;
! 
!       while (inlen > 0 && outlen > 0) {
!               if (*pin < 0 || *pin > 127)
!                       *pout = '?';
!               else
!                       *pout = *pin;
! 
!               inlen--;
!               outlen--;
!               pin++;
!               if (*pout++ == '\0') break;
!       }
  #endif
        return (nconv < 0) ?  -1 : pout - outstring;
***************
*** 583,587 ****
        pout = outstring;
  
! #ifdef HAVE_ICONV
        iconv_t cd;
  
--- 597,601 ----
        pout = outstring;
  
! #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
        iconv_t cd;
  
***************
*** 592,596 ****
        iconv_close(cd);
  #else
! #     error "iconv is missing"
  #endif
        return (nconv < 0) ?  -1 : pout - outstring;
--- 606,624 ----
        iconv_close(cd);
  #else
!       nconv = 0;
!       pin = (char *)instring;
!       pout = outstring;
! 
!       while (inlen > 0 && outlen > 0) {
!               if (*pin < 0 || *pin > 127)
!                       *pout = '?';
!               else
!                       *pout = *pin;
! 
!               inlen--;
!               outlen--;
!               pin++;
!               if (*pout++ == '\0') break;
!       }
  #endif
        return (nconv < 0) ?  -1 : pout - outstring;

Index: gnokii.pc.in
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/gnokii.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnokii.pc.in        18 Aug 2003 18:03:24 -0000      1.3
--- gnokii.pc.in        3 Nov 2003 21:16:39 -0000       1.4
***************
*** 7,10 ****
  Description: Gnokii library interface
  Version: @VERSION@
! Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@
  Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
--- 7,10 ----
  Description: Gnokii library interface
  Version: @VERSION@
! Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
  Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@

Index: readmidi.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/readmidi.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** readmidi.c  4 Oct 2003 02:21:28 -0000       1.3
--- readmidi.c  3 Nov 2003 21:16:40 -0000       1.4
***************
*** 198,201 ****
--- 198,202 ----
  
  #include "config.h"
+ #include "misc.h"
  #include "gnokii.h"
  #include <stdio.h>