dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

glob is no longer needed

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4657 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-04-15 12:51:02 +00:00
parent b6f39da3aa
commit d4cedcefee
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/util.cpp
View file

@ -555,16 +555,6 @@ FILE *my_fopen(const char *path, const char *mode)
my_convert_free(converted_path); my_convert_free(converted_path);
return result; 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 #endif//!_WIN32
void *operator new(size_t size) { void *operator new(size_t size) {

3
Source/util.h
View file

@ -9,7 +9,6 @@
#ifndef _WIN32 #ifndef _WIN32
# include <iconv.h> # include <iconv.h>
# include <stdio.h> # include <stdio.h>
# include <glob.h>
#endif #endif
@ -64,13 +63,11 @@ int my_glob(const char *pattern, int flags,
int errfunc(const char * epath, int eerrno), glob_t *pglob); int errfunc(const char * epath, int eerrno), glob_t *pglob);
#define FOPEN(a, b) my_fopen(a, b) #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) #define OPEN(a, b) my_open(a, b)
#else #else
#define FOPEN(a, b) fopen(a, b) #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) #define OPEN(a, b) open(a, b)
#endif #endif