From d4cedcefee5d641909cb6a389f1e68793c0ba700 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 15 Apr 2006 12:51:02 +0000 Subject: [PATCH] glob is no longer needed git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4657 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/util.cpp | 10 ---------- Source/util.h | 3 --- 2 files changed, 13 deletions(-) diff --git a/Source/util.cpp b/Source/util.cpp index 8fa98ce0..bb645e95 100644 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -555,16 +555,6 @@ FILE *my_fopen(const char *path, const char *mode) my_convert_free(converted_path); return result; } - -int my_glob(const char *pattern, int flags, - int errfunc(const char * epath, int eerrno), glob_t *pglob) -{ - char *converted_pattern = my_convert(pattern); - - int result = glob(converted_pattern, flags, errfunc, pglob); - my_convert_free(converted_pattern); - return result; -} #endif//!_WIN32 void *operator new(size_t size) { diff --git a/Source/util.h b/Source/util.h index dc280f6d..6911b836 100644 --- a/Source/util.h +++ b/Source/util.h @@ -9,7 +9,6 @@ #ifndef _WIN32 # include # include -# include #endif @@ -64,13 +63,11 @@ int my_glob(const char *pattern, int flags, int errfunc(const char * epath, int eerrno), glob_t *pglob); #define FOPEN(a, b) my_fopen(a, b) -#define GLOB(a, b, c, d) my_glob(a, b, c, d) #define OPEN(a, b) my_open(a, b) #else #define FOPEN(a, b) fopen(a, b) -#define GLOB(a, b, c, d) glob(a, b, c, d) #define OPEN(a, b) open(a, b) #endif