← Back to branch summary

~ubuntu-branches/ubuntu/precise/wget/precise-proposed

« back to all changes in this revision

Viewing changes to src/ptimer.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-10-19 00:00:09 UTC
  • mfrom: (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20111019000009-8p33w3wz4b1rdri0
Tags: 1.13-1ubuntu1
https://launchpad.net/bugs/503339
* Merge from Debian unstable, remaining changes:
  - Add wget-udeb to ship wget.gnu as alternative to busybox wget
    implementation.
  - Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
* Dropped changes, superseded in Debian:
  - Keep build dependencies in main:
    + debian/control: remove info2man build-dep
    + debian/patches/series: disable wget-infopod_generated_manpage
  - Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
    can depend on it.
* Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb for
  it.
* Add a second build pass for the udeb, so we can build without libidn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ptimer.c
1
1
/* Portable timers.
2
 
   Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3
 
   Inc.
 
2
   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 
3
   Foundation, Inc.
4
4
 
5
5
This file is part of GNU Wget.
6
6
 
57
57
#include <stdlib.h>
58
58
#include <string.h>
59
59
#include <errno.h>
60
 
#ifdef HAVE_UNISTD_H
61
 
# include <unistd.h>
62
 
#endif
 
60
#include <unistd.h>
63
61
#include <time.h>
64
62
#ifdef HAVE_SYS_TIME_H
65
63
# include <sys/time.h>