summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Riedy <ejr@EECS.Berkeley.EDU>2005-12-06 22:20:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-07 00:15:55 (GMT)
commita6da9395a5b6d3df901ce0a6cb61d123f77d7342 (patch)
tree06c986caabcf4b5c9eefca3678bc85444fb281d4
parentbe61db922a230ae2638c27c071ee4b8c98f01f72 (diff)
downloadgit-a6da9395a5b6d3df901ce0a6cb61d123f77d7342.zip
git-a6da9395a5b6d3df901ce0a6cb61d123f77d7342.tar.gz
git-a6da9395a5b6d3df901ce0a6cb61d123f77d7342.tar.bz2
[PATCH] Initial AIX portability fixes.
Added an AIX clause in the Makefile; that clause likely will be wrong for any AIX pre-5.2, but I can only test on 5.3. mailinfo.c was missing the compat header file, and convert-objects.c needs to define a specific _XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile4
-rw-r--r--convert-objects.c3
-rw-r--r--mailinfo.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 425c519..01b6643 100644
--- a/Makefile
+++ b/Makefile
@@ -243,6 +243,10 @@ ifeq ($(uname_S),NetBSD)
ALL_CFLAGS += -I/usr/pkg/include
ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
endif
+ifeq ($(uname_S),AIX)
+ NO_STRCASESTR=YesPlease
+ NEEDS_LIBICONV=YesPlease
+endif
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
diff --git a/convert-objects.c b/convert-objects.c
index d78a8b4..b49bce2 100644
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -1,4 +1,5 @@
-#define _XOPEN_SOURCE /* glibc2 needs this */
+#define _XOPEN_SOURCE 500 /* glibc2 and AIX 5.3L need this */
+#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#include <time.h>
#include "cache.h"
diff --git a/mailinfo.c b/mailinfo.c
index 3b97a89..d4b4163 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <ctype.h>
#include <iconv.h>
+#include "git-compat-util.h"
#include "cache.h"
static FILE *cmitmsg, *patchfile;