Diff for /libraries/liblber/lber-int.h between versions 1.32 and 1.33

version 1.32, 1999/11/26 22:32:20 version 1.33, 1999/11/27 22:40:09
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/liblber/lber-int.h,v 1.31 1999/11/25 16:45:22 kdz Exp $ */  /* $OpenLDAP$ */
 /*  /*
  * Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 24 Line 24
   
 LDAP_BEGIN_DECL  LDAP_BEGIN_DECL
   
 extern BER_ERRNO_FN ber_int_errno_fn;  LIBLBER_F (BER_ERRNO_FN) ber_int_errno_fn;
   
 struct lber_options {  struct lber_options {
         short lbo_valid;          short lbo_valid;
Line 37  struct lber_options { Line 37  struct lber_options {
         int lbo_debug;          int lbo_debug;
 };  };
   
 extern struct lber_options ber_int_options;  LIBLBER_F (struct lber_options) ber_int_options;
 #define ber_int_debug ber_int_options.lbo_debug  #define ber_int_debug ber_int_options.lbo_debug
   
 struct berelement {  struct berelement {
Line 98  typedef struct sockbuf_io Sockbuf_IO; Line 98  typedef struct sockbuf_io Sockbuf_IO;
 typedef struct sockbuf_sec Sockbuf_Sec;  typedef struct sockbuf_sec Sockbuf_Sec;
 typedef struct sockbuf_buf Sockbuf_Buf;  typedef struct sockbuf_buf Sockbuf_Buf;
   
 LDAP_F( Sockbuf_IO ) ber_pvt_sb_io_tcp;  LIBLBER_F( Sockbuf_IO ) ber_pvt_sb_io_tcp;
 LDAP_F( Sockbuf_IO ) ber_pvt_sb_io_udp;  LIBLBER_F( Sockbuf_IO ) ber_pvt_sb_io_udp;
   
   
 struct sockbuf {  struct sockbuf {
Line 180  struct seqorset { Line 180  struct seqorset {
  */   */
 #define ber_log_printf ber_pvt_log_printf  #define ber_log_printf ber_pvt_log_printf
   
 #ifdef __MINGW32__  LIBLBER_F( int )
 #   undef LDAP_F_PRE  
 #   ifdef LIBLBER_DECL  
 #       define LDAP_F_PRE       extern __declspec(LIBLBER_DECL)  
 #   else  
 #       define LDAP_F_PRE       extern  
 #   endif  
 #endif  
   
 LDAP_F( int )  
 ber_log_bprint LDAP_P((  ber_log_bprint LDAP_P((
         int errlvl,          int errlvl,
         int loglvl,          int loglvl,
         const char *data,          const char *data,
         ber_len_t len ));          ber_len_t len ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_log_dump LDAP_P((  ber_log_dump LDAP_P((
         int errlvl,          int errlvl,
         int loglvl,          int loglvl,
         BerElement *ber,          BerElement *ber,
         int inout ));          int inout ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_log_sos_dump LDAP_P((  ber_log_sos_dump LDAP_P((
         int errlvl,          int errlvl,
         int loglvl,          int loglvl,
Line 212  ber_log_sos_dump LDAP_P(( Line 203  ber_log_sos_dump LDAP_P((
   
 /* memory.c */  /* memory.c */
         /* simple macros to realloc for now */          /* simple macros to realloc for now */
 extern BerMemoryFunctions*              ber_int_memory_fns;  LIBLBER_F (BerMemoryFunctions *)        ber_int_memory_fns;
   
 #ifdef CSRIMALLOC  #ifdef CSRIMALLOC
 #define LBER_INT_MALLOC         malloc  #define LBER_INT_MALLOC         malloc
Line 249  extern BerMemoryFunctions*  ber_int_memo Line 240  extern BerMemoryFunctions*  ber_int_memo
   
 /* these should be ber_int*() functions */  /* these should be ber_int*() functions */
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_sb_init LDAP_P(( Sockbuf *sb ));  ber_pvt_sb_init LDAP_P(( Sockbuf *sb ));
   
 LDAP_F( int )  LIBLBER_F(      int )
 ber_pvt_sb_destroy LDAP_P(( Sockbuf *sb ));  ber_pvt_sb_destroy LDAP_P(( Sockbuf *sb ));
   
 #ifdef USE_SASL  #ifdef USE_SASL
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_sb_set_sec LDAP_P(( Sockbuf *sb, Sockbuf_Sec *sec, void *arg ));  ber_pvt_sb_set_sec LDAP_P(( Sockbuf *sb, Sockbuf_Sec *sec, void *arg ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_sb_clear_sec LDAP_P(( Sockbuf *sb ));  ber_pvt_sb_clear_sec LDAP_P(( Sockbuf *sb ));
 #endif  #endif
   
 LDAP_F( int )  LIBLBER_F(      int )
 ber_pvt_sb_set_io LDAP_P(( Sockbuf *sb, Sockbuf_IO *layer, void *arg ));  ber_pvt_sb_set_io LDAP_P(( Sockbuf *sb, Sockbuf_IO *layer, void *arg ));
   
 LDAP_F( int )  LIBLBER_F(      int )
 ber_pvt_sb_clear_io LDAP_P(( Sockbuf *sb ));  ber_pvt_sb_clear_io LDAP_P(( Sockbuf *sb ));
   
 LDAP_F( int )  LIBLBER_F(      int )
 ber_pvt_sb_close LDAP_P((Sockbuf *sb ));  ber_pvt_sb_close LDAP_P((Sockbuf *sb ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_sb_set_nonblock LDAP_P(( Sockbuf *sb, int nb ));  ber_pvt_sb_set_nonblock LDAP_P(( Sockbuf *sb, int nb ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_sb_set_readahead LDAP_P(( Sockbuf *sb, int rh ));  ber_pvt_sb_set_readahead LDAP_P(( Sockbuf *sb, int rh ));
   
 LDAP_F( ber_slen_t )  LIBLBER_F( ber_slen_t )
 ber_pvt_sb_read LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));  ber_pvt_sb_read LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));
   
 LDAP_F( ber_slen_t )  LIBLBER_F( ber_slen_t )
 ber_pvt_sb_write LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));  ber_pvt_sb_write LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));
   
 LDAP_F( int )  LIBLBER_F(      int )
 ber_pvt_sb_udp_set_dst LDAP_P((Sockbuf *sb, void *addr ));  ber_pvt_sb_udp_set_dst LDAP_P((Sockbuf *sb, void *addr ));
   
 LDAP_F( void * )  LIBLBER_F(      void * )
 ber_pvt_sb_udp_get_src LDAP_P((Sockbuf *sb ));  ber_pvt_sb_udp_get_src LDAP_P((Sockbuf *sb ));
   
 LDAP_F( int )  LIBLBER_F( int )
 ber_pvt_socket_set_nonblock LDAP_P(( ber_socket_t sd, int nb ));  ber_pvt_socket_set_nonblock LDAP_P(( ber_socket_t sd, int nb ));
   
 #endif /* _LBER_INT_H */  #endif /* _LBER_INT_H */

Removed from v.1.32  
changed lines
  Added in v.1.33


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org