← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-security

« back to all changes in this revision

Viewing changes to lib/setup-os400.h

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-20 13:56:28 UTC
  • mfrom: (3.4.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100620135628-e30tp9jldq6hq985
Tags: 7.21.0-1ubuntu1
https://launchpad.net/bugs/596334
* Merge from debian unstable.  Remaining changes: LP: #596334
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/setup-os400.h
1
 
#ifndef __SETUP_OS400_H
2
 
#define __SETUP_OS400_H
 
1
#ifndef HEADER_CURL_SETUP_OS400_H
 
2
#define HEADER_CURL_SETUP_OS400_H
3
3
/***************************************************************************
4
4
 *                                  _   _ ____  _
5
5
 *  Project                     ___| | | |  _ \| |
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
20
20
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
21
 * KIND, either express or implied.
22
22
 *
23
 
 * $Id: setup-os400.h,v 1.6 2009-05-02 02:37:34 yangtse Exp $
24
23
 ***************************************************************************/
25
24
 
26
25
 
94
93
                                             gss_flags_t req_flags,
95
94
                                             OM_uint32 time_req,
96
95
                                             gss_channel_bindings_t
97
 
                                             input_chan_bindings,  
 
96
                                             input_chan_bindings,
98
97
                                             gss_buffer_t input_token,
99
98
                                             gss_OID * actual_mech_type,
100
99
                                             gss_buffer_t output_token,
138
137
#define recvfrom                Curl_os400_recvfrom
139
138
 
140
139
 
141
 
#endif /* __SETUP_OS400_H */
 
140
#endif /* HEADER_CURL_SETUP_OS400_H */