Commit e97179b6de293c8f288957dc556239a44fa52e3e
2010-01-13T20:01:11
win32: Add a 'git__' prefix to the directory reading routines This reduces the global namespace pollution and allows for a win32 compiler (eg. Open Watcom) to provide these routines in a header other than <dirent.h> (eg in <io.h>). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/src/dir.h b/src/dir.h
index 62ee0b8..c01c3fa 100644
--- a/src/dir.h
+++ b/src/dir.h
@@ -9,7 +9,7 @@
#ifdef GIT_WIN32
-struct dirent {
+struct git__dirent {
int d_ino;
char d_name[261];
};
@@ -17,15 +17,24 @@ struct dirent {
typedef struct {
HANDLE h;
WIN32_FIND_DATA f;
- struct dirent entry;
+ struct git__dirent entry;
char *dir;
int first;
-} DIR;
-
-extern DIR *opendir(const char *);
-extern struct dirent *readdir(DIR *);
-extern void rewinddir(DIR *);
-extern int closedir(DIR *);
+} git__DIR;
+
+extern git__DIR *git__opendir(const char *);
+extern struct git__dirent *git__readdir(git__DIR *);
+extern void git__rewinddir(git__DIR *);
+extern int git__closedir(git__DIR *);
+
+# ifndef GIT__WIN32_NO_WRAP_DIR
+# define dirent git__dirent
+# define DIR git__DIR
+# define opendir git__opendir
+# define readdir git__readdir
+# define rewinddir git__rewinddir
+# define closedir git__closedir
+# endif
#endif
diff --git a/src/win32/dir.c b/src/win32/dir.c
index a43ff63..069a41c 100644
--- a/src/win32/dir.c
+++ b/src/win32/dir.c
@@ -1,3 +1,4 @@
+#define GIT__WIN32_NO_WRAP_DIR
#include "dir.h"
static int init_filter(char *filter, size_t n, const char *dir)
@@ -15,10 +16,10 @@ static int init_filter(char *filter, size_t n, const char *dir)
return 1;
}
-DIR *opendir(const char *dir)
+git__DIR *git__opendir(const char *dir)
{
char filter[4096];
- DIR *new;
+ git__DIR *new;
if (!dir || !init_filter(filter, sizeof(filter), dir))
return NULL;
@@ -45,7 +46,7 @@ DIR *opendir(const char *dir)
return new;
}
-struct dirent *readdir(DIR *d)
+struct git__dirent *git__readdir(git__DIR *d)
{
if (!d || d->h == INVALID_HANDLE_VALUE)
return NULL;
@@ -66,7 +67,7 @@ struct dirent *readdir(DIR *d)
return &d->entry;
}
-void rewinddir(DIR *d)
+void git__rewinddir(git__DIR *d)
{
char filter[4096];
@@ -83,7 +84,7 @@ void rewinddir(DIR *d)
}
}
-int closedir(DIR *d)
+int git__closedir(git__DIR *d)
{
if (d) {
if (d->h != INVALID_HANDLE_VALUE)