← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnupg2/hardy-proposed

« back to all changes in this revision

Viewing changes to intl/printf-args.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-05-15 13:54:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070515135455-89qfyalmgjy6gcqw
Tags: 2.0.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
  - Build-depend on libcurl3-gnutls-dev
  - g10/call-agent.c: set DBG_ASSUAN to 0 to suppress a debug message
  - Include /doc files as done with gnupg
  - debian/rules: add doc/com-certs.pem to the docs for gpgsm
  - debian/copyright: update download url
  - debian/README.Debian: remove note the gnupg2 isn't released yet.
  - debian/control: Change Maintainer/XSBC-Original-Maintainer field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intl/printf-args.c
16
16
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
17
17
   USA.  */
18
18
 
19
 
#ifdef HAVE_CONFIG_H
20
 
# include <config.h>
21
 
#endif
 
19
#include <config.h>
22
20
 
23
21
/* Specification.  */
24
22
#include "printf-args.h"
59
57
      case TYPE_ULONGINT:
60
58
        ap->a.a_ulongint = va_arg (args, unsigned long int);
61
59
        break;
62
 
#ifdef HAVE_LONG_LONG
 
60
#ifdef HAVE_LONG_LONG_INT
63
61
      case TYPE_LONGLONGINT:
64
62
        ap->a.a_longlongint = va_arg (args, long long int);
65
63
        break;
131
129
      case TYPE_COUNT_LONGINT_POINTER:
132
130
        ap->a.a_count_longint_pointer = va_arg (args, long int *);
133
131
        break;
134
 
#ifdef HAVE_LONG_LONG
 
132
#ifdef HAVE_LONG_LONG_INT
135
133
      case TYPE_COUNT_LONGLONGINT_POINTER:
136
134
        ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
137
135
        break;