diff options
| author | jbj <devnull@localhost> | 2001-08-15 14:03:03 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-08-15 14:03:03 +0000 |
| commit | e42f1fd9675c52de900356a73777ec482e285591 (patch) | |
| tree | 61408a50ec269e48ade5d9e20cb6a0fa56c41e0b /rpmio/rpmlog.c | |
| parent | a36acaf3b8f2a1417c65ab9f68e3a868045a12d4 (diff) | |
| download | librpm-tizen-e42f1fd9675c52de900356a73777ec482e285591.tar.gz librpm-tizen-e42f1fd9675c52de900356a73777ec482e285591.tar.bz2 librpm-tizen-e42f1fd9675c52de900356a73777ec482e285591.zip | |
- always use dl size in regionSwab() return.
- ppc: revert ppcmac to ppc.
- ppc: autoconf test for va_copy.
CVS patchset: 5015
CVS date: 2001/08/15 14:03:03
Diffstat (limited to 'rpmio/rpmlog.c')
| -rw-r--r-- | rpmio/rpmlog.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 755a238ac..16c702089 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -7,6 +7,18 @@ #include "rpmlog.h" #include "debug.h" +#ifndef va_copy +# ifdef __va_copy +# define va_copy(DEST,SRC) __va_copy((DEST),(SRC)) +# else +# ifdef HAVE_VA_LIST_AS_ARRAY +# define va_copy(DEST,SRC) (*(DEST) = *(SRC)) +# else +# define va_copy(DEST,SRC) ((DEST) = (SRC)) +# endif +# endif +#endif + /*@access rpmlogRec @*/ static int nrecs = 0; @@ -136,13 +148,9 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) /* Allocate a sufficently large buffer for output. */ while (1) { -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0 - /*@-unrecog@*/ nb = vsnprintf(msgbuf, msgnb, fmt, ap); /*@=unrecog@*/ -#else va_list apc; - /*@-sysunrecog -usedef@*/ __va_copy(apc, ap); /*@=sysunrecog =usedef@*/ + /*@-sysunrecog -usedef@*/ va_copy(apc, ap); /*@=sysunrecog =usedef@*/ /*@-unrecog@*/ nb = vsnprintf(msgbuf, msgnb, fmt, apc); /*@=unrecog@*/ -#endif if (nb > -1 && nb < msgnb) break; if (nb > -1) /* glibc 2.1 */ |