← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/setup.h

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-11-29 17:26:37 UTC
  • mfrom: (3.4.9 sid)
  • Revision ID: james.westby@ubuntu.com-20101129172637-7wwnlut14uxp2kfx
Tags: 7.21.2-1ubuntu1
https://launchpad.net/bugs/682286
* Merge with Debian unstable, remaining Ubuntu changes: (LP: #682286)
* debian/control:
  - (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:
src/setup.h
207
207
#define strdup(ptr) curlx_strdup(ptr)
208
208
#endif
209
209
 
 
210
/* Define S_ISREG if not defined by system headers, f.e. MSVC */
 
211
#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
 
212
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 
213
#endif
 
214
 
210
215
/*
211
216
 * Include macros and defines that should only be processed once.
212
217
 */