← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnupg/natty-security

« back to all changes in this revision

Viewing changes to include/ttyio.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2010-01-04 20:06:01 UTC
  • mfrom: (1.1.11 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100104200601-0rble341i2xns9xw
Tags: 1.4.10-2ubuntu1
https://launchpad.net/bugs/503064
https://launchpad.net/bugs/477818
* Merge from Debian testing (lp: #503064, #477818). Remaining changes:
  - Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test
    since it fails with ulimit 0 (on buildds).
  - Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg
    (or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485)
  - Fix udeb build failure on powerpc, building with -O2 instead of -Os.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/ttyio.h
53
53
#define tty_enable_completion(x)
54
54
#define tty_disable_completion()
55
55
#endif
 
56
void tty_cleanup_after_signal (void);
56
57
 
57
58
#endif /*G10_TTYIO_H*/