diff options
author | Darren Tucker <dtucker@zip.com.au> | 2015-10-29 10:48:23 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2015-10-29 10:48:23 +1100 |
commit | 8db134e7f457bcb069ec72bc4ee722e2af557c69 (patch) | |
tree | a0d16eb42cc7d97396504b75163b812468811269 /includes.h | |
parent | 86c10dbbef6a5800d2431a66cf7f41a954bb62b5 (diff) |
Prevent name collisions with system glob (bz#2463)
Move glob.h from includes.h to the only caller (sftp) and override the
names for the symbols. This prevents name collisions with the system glob
in the case where something other than ssh uses it (eg kerberos). With
jjelen at redhat.com, ok djm@
Diffstat (limited to 'includes.h')
-rw-r--r-- | includes.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/includes.h b/includes.h index 2893a54cd..497a038b2 100644 --- a/includes.h +++ b/includes.h | |||
@@ -32,12 +32,6 @@ | |||
32 | #ifdef HAVE_BSTRING_H | 32 | #ifdef HAVE_BSTRING_H |
33 | # include <bstring.h> | 33 | # include <bstring.h> |
34 | #endif | 34 | #endif |
35 | #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ | ||
36 | defined(GLOB_HAS_GL_MATCHC) && defined(GLOB_HAS_GL_STATV) && \ | ||
37 | defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 && \ | ||
38 | !defined(BROKEN_GLOB) | ||
39 | # include <glob.h> | ||
40 | #endif | ||
41 | #ifdef HAVE_ENDIAN_H | 35 | #ifdef HAVE_ENDIAN_H |
42 | # include <endian.h> | 36 | # include <endian.h> |
43 | #endif | 37 | #endif |