~ubuntu-branches/ubuntu/lucid/curl/lucid-201101212007

« back to all changes in this revision

Viewing changes to lib/socks_gssapi.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-05-26 18:58:51 UTC
  • mfrom: (3.3.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090526185851-t1gun9nboi5kbd9u
Tags: 7.19.5-1ubuntu1
* Merge from Debian unstable (LP: #380281), remaining changes:
  - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Call automake-1.9 with --add-missing --copy --force
* Fixes LP: #379477

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
 * KIND, either express or implied.
20
20
 *
21
 
 * $Id: socks_gssapi.c,v 1.2 2009-01-30 19:29:25 danf Exp $
 
21
 * $Id: socks_gssapi.c,v 1.3 2009-04-21 10:26:59 yangtse Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
34
34
#endif
35
35
#include <string.h>
36
36
 
37
 
#ifdef NEED_MALLOC_H
38
 
#include <malloc.h>
39
 
#endif
40
37
#ifdef HAVE_STDLIB_H
41
38
#include <stdlib.h>
42
39
#endif