From c8e1897c969ce43b551c29d65bc605f175c01263 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Thu, 2 Jul 2009 19:48:34 +0000 Subject: Update trio to CVS checkout of 2009-07-02. svn path=/branches/BRANCH_6-3/; revision=5370 --- trio/trio.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'trio/trio.h') diff --git a/trio/trio.h b/trio/trio.h index 82e65fcc..ad29222d 100644 --- a/trio/trio.h +++ b/trio/trio.h @@ -1,6 +1,6 @@ /************************************************************************* * - * $Id: trio.h,v 1.16 2003/03/06 20:29:48 breese Exp $ + * $Id: trio.h,v 1.18 2008/11/09 10:52:26 breese Exp $ * * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg. * @@ -32,15 +32,9 @@ # include #endif -#include "triodef.h" +#include "triop.h" #include -#include -#if defined(TRIO_COMPILER_ANCIENT) -# include -#else -# include -#endif #ifdef __cplusplus extern "C" { @@ -110,11 +104,14 @@ int trio_snprintfcat TRIO_PROTO((char *buffer, size_t max, TRIO_CONST char *form int trio_vsnprintfcat TRIO_PROTO((char *buffer, size_t bufferSize, TRIO_CONST char *format, va_list args)); +#if defined(TRIO_DEPRECATED) char *trio_aprintf TRIO_PROTO((TRIO_CONST char *format, ...)); char *trio_vaprintf TRIO_PROTO((TRIO_CONST char *format, va_list args)); +#endif int trio_asprintf TRIO_PROTO((char **ret, TRIO_CONST char *format, ...)); int trio_vasprintf TRIO_PROTO((char **ret, TRIO_CONST char *format, va_list args)); +int trio_asprintfv TRIO_PROTO((char **result, TRIO_CONST char *format, trio_pointer_t * args)); /************************************************************************* * Scan Functions -- cgit v1.2.3