mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
Fixed conflicts from last checkin.
This commit is contained in:
parent
4025885697
commit
ca030a4f4e
@ -1,8 +1,5 @@
|
||||
<<<<<<< API.xs
|
||||
=======
|
||||
/*
|
||||
*******************************************************************************
|
||||
* $Id: API.xs,v 1.4 1998/07/23 12:34:32 clayton Exp $
|
||||
/******************************************************************************
|
||||
* $Id: API.xs,v 1.5 1998/07/24 15:19:10 clayton Exp $
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License
|
||||
* Version 1.0 (the "License"); you may not use this file except in
|
||||
@ -25,9 +22,8 @@
|
||||
* DESCRIPTION
|
||||
* This is the XSUB interface for the API.
|
||||
*
|
||||
*******************************************************************************/
|
||||
*****************************************************************************/
|
||||
|
||||
>>>>>>> 1.3
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@ -150,7 +146,7 @@ SV* charptrptr2avref(char **cppval)
|
||||
SV* SVval = newSVpv(cppval[ix],0);
|
||||
av_push(tmp_av,SVval);
|
||||
}
|
||||
ldap_values_free(cppval);
|
||||
ldap_value_free(cppval);
|
||||
}
|
||||
return(tmp_ref);
|
||||
}
|
||||
@ -170,7 +166,7 @@ SV* berptrptr2avref(struct berval **bval)
|
||||
SV *SVval = newSVpv(bval[ix]->bv_val,bval[ix]->bv_len);
|
||||
av_push(tmp_av,SVval);
|
||||
}
|
||||
ldap_values_free_len(bval);
|
||||
ldap_value_free_len(bval);
|
||||
}
|
||||
return(tmp_ref);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user