Diff for /embedaddon/libiconv/include/iconv.h.in between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2012/05/29 09:29:43
Line 1 Line 1
/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc./* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.     This file is part of the GNU LIBICONV Library.
   
    The GNU LIBICONV Library is free software; you can redistribute it     The GNU LIBICONV Library is free software; you can redistribute it
Line 21 Line 21
 #ifndef _LIBICONV_H  #ifndef _LIBICONV_H
 #define _LIBICONV_H  #define _LIBICONV_H
   
#define _LIBICONV_VERSION 0x010D    /* version number: (major<<8) + minor */#define _LIBICONV_VERSION 0x010E    /* version number: (major<<8) + minor */
 extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */  extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
   
 /* We would like to #include any system header file which could define  /* We would like to #include any system header file which could define
Line 89  extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * Line 89  extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* *
 extern int iconv_close (iconv_t cd);  extern int iconv_close (iconv_t cd);
   
   
   #ifdef __cplusplus
   }
   #endif
   
   
 #ifndef LIBICONV_PLUG  #ifndef LIBICONV_PLUG
   
 /* Nonstandard extensions. */  /* Nonstandard extensions. */
Line 106  extern int iconv_close (iconv_t cd); Line 111  extern int iconv_close (iconv_t cd);
 #include <wchar.h>  #include <wchar.h>
 #endif  #endif
   
   #ifdef __cplusplus
   extern "C" {
   #endif
   
 /* A type that holds all memory needed by a conversion descriptor.  /* A type that holds all memory needed by a conversion descriptor.
    A pointer to such an object can be used as an iconv_t. */     A pointer to such an object can be used as an iconv_t. */
 typedef struct {  typedef struct {
Line 221  extern const char * iconv_canonicalize (const char * n Line 230  extern const char * iconv_canonicalize (const char * n
    prefixes should be directory names without trailing slash (i.e. use ""     prefixes should be directory names without trailing slash (i.e. use ""
    instead of "/").  */     instead of "/").  */
 extern void libiconv_set_relocation_prefix (const char *orig_prefix,  extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                            const char *curr_prefix);                                            const char *curr_prefix);
   
 #endif  
   
   
 #ifdef __cplusplus  #ifdef __cplusplus
 }  }
   #endif
   
 #endif  #endif
   
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>