← Back to branch summary

~ubuntu-branches/ubuntu/lucid/transmission/lucid

« back to all changes in this revision

Viewing changes to third-party/libnatpmp/natpmp.h

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda, Krzysztof Klimonda, Chris Coulson
  • Date: 2010-03-03 02:55:26 UTC
  • mfrom: (1.1.34 upstream) (2.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100303025526-qcjmpnlvk9jv3y5o
Tags: 1.92-0ubuntu1
https://launchpad.net/bugs/538034
https://launchpad.net/bugs/518692
https://launchpad.net/bugs/529037
https://launchpad.net/bugs/527299
https://launchpad.net/bugs/505861
https://launchpad.net/bugs/542194
[ Krzysztof Klimonda ]
* New upstream release (LP: #538034), rebased on debian testing.
  Remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
      Can be removed in lucid+1
    + Added liblaunchpad-integration-dev and lsb-release to Build-Depends
  - debian/rules:
    + create a po template during package build.
  - debian/patches/01_lpi.patch:
    + integrate transmission with launchpad
  - debian/patches/20_add_x-ubuntu-gettext-domain.diff:
    + add x-ubuntu-gettext-domain to .desktop file.
  - debian/transmission-daemon.default:
    - remove --auth from OPTIONS
  - debian/control, debian/rules:
    + build transmission gtk+ client with both gconf and libcanberra support.
  - debian/patches/dont_build_libevent.patch:
    + disable libevent in configure.ac and Makefile.am because we use autotools
      to regenerate build files.
  - lucid/debian/patches/updateminiupnpcstrings_double_escape_slash.patch:
    + Deleted as the bug is fixed upstream
* Fixes bugs:
  - Fix directory selection error in GTK+ 2.19 (LP: #518692)
  - Transmission "Set Location" - dialog doesn't disappear (LP: #529037)
  - The "Torrent Options" dialog's Torrent Priority row gets too much
    vertical stretch (LP: #527299)
  - "Open Folder" behavior can be confusing for single-file torrents
    (LP: #505861)
* Refreshed 99_autoreconf.patch

[ Chris Coulson ]
* debian/patches/disable_web_ui.patch:
  - Disable the web UI by default again (LP: #542194)

Show diffs side-by-side

added added

removed removed

Lines of Context:
third-party/libnatpmp/natpmp.h
1
 
/* $Id: natpmp.h,v 1.11 2009/02/27 22:38:05 nanard Exp $ */
 
1
/* $Id: natpmp.h,v 1.12 2009/12/19 12:00:00 nanard Exp $ */
2
2
/* libnatpmp
3
3
 * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
4
4
 * http://miniupnp.free.fr/libnatpmp.html
21
21
#define NATPMP_PORT (5351)
22
22
 
23
23
#include <time.h>
 
24
#if !defined(_MSC_VER)
24
25
#include <sys/time.h>
 
26
#endif
25
27
#ifdef WIN32
26
28
#include <winsock2.h>
 
29
#if !defined(_MSC_VER)
27
30
#include <stdint.h>
 
31
#else
 
32
typedef unsigned long uint32_t;
 
33
typedef unsigned short uint16_t;
 
34
#endif
28
35
#define in_addr_t uint32_t
29
36
#include "declspec.h"
30
37
#else