X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=compat%2Ffopen.c;h=b5ca142fedf2ac0e0cedde1011ab385f65010fdf;hb=df6840855d24c2f54c0b8a66cbac33d8af43333a;hp=ccb9e89fa46144744fa530930d8db7644ab2da74;hpb=53b22a9e45161004ff3260782abc4ee2a5b3e730;p=git.git

diff --git a/compat/fopen.c b/compat/fopen.c
index ccb9e89fa..b5ca142fe 100644
--- a/compat/fopen.c
+++ b/compat/fopen.c
@@ -1,5 +1,16 @@
+/*
+ *  The order of the following two lines is important.
+ *
+ *  FREAD_READS_DIRECTORIES is undefined before including git-compat-util.h
+ *  to avoid the redefinition of fopen within git-compat-util.h. This is
+ *  necessary since fopen is a macro on some platforms which may be set
+ *  based on compiler options. For example, on AIX fopen is set to fopen64
+ *  when _LARGE_FILES is defined. The previous technique of merely undefining
+ *  fopen after including git-compat-util.h is inadequate in this case.
+ */
+#undef FREAD_READS_DIRECTORIES
 #include "../git-compat-util.h"
-#undef fopen
+
 FILE *git_fopen(const char *path, const char *mode)
 {
 	FILE *fp;