PATCH: AIX dependencies and AIX compile problem

PATCH: AIX dependencies and AIX compile problem

[Oliver Kiddle]

This patch fixes AIX compile dependencies introduced since 3.1.6-dev-21.
There may be more to come because I haven't yet got a clean compile: I get
an error message for lines 925 and 968 of init.c saying 'Operands must be
pointers to compatible types' and I haven't got time at the moment to look
into that in more detail.

Oliver

Index: Src/glob.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/glob.c,v
retrieving revision 1.4
diff -u -r1.4 glob.c
--- Src/glob.c	2000/04/14 11:49:31	1.4
+++ Src/glob.c	2000/04/30 17:52:52
@@ -1514,7 +1514,7 @@
 /* check to see if str is eligible for brace expansion */
 
 /**/
-int
+mod_export int
 hasbraces(char *str)
 {
     char *lbr, *mbr, *comma;
@@ -1696,7 +1696,7 @@
 /* brace expansion */
 
 /**/
-void
+mod_export void
 xpandbraces(LinkList list, LinkNode *np)
 {
     LinkNode node = (*np), last = prevnode(node);
Index: Src/math.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/math.c,v
retrieving revision 1.1.1.30
diff -u -r1.1.1.30 math.c
--- Src/math.c	2000/03/15 09:36:28	1.1.1.30
+++ Src/math.c	2000/04/30 17:52:52
@@ -943,7 +943,7 @@
 }
 
 /**/
-zlong
+mod_export zlong
 mathevali(char *s)
 {
     mnumber x = matheval(s);
Index: Src/module.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/module.c,v
retrieving revision 1.2
diff -u -r1.2 module.c
--- Src/module.c	2000/04/19 13:42:51	1.2
+++ Src/module.c	2000/04/30 17:52:52
@@ -666,7 +666,7 @@
 }
 
 /**/
-int
+mod_export int
 load_module(char const *name)
 {
     Module m;
Index: Src/Zle/compcore.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/compcore.c,v
retrieving revision 1.11
diff -u -r1.11 compcore.c
--- Src/Zle/compcore.c	2000/04/27 08:21:10	1.11
+++ Src/Zle/compcore.c	2000/04/30 17:52:53
@@ -42,13 +42,12 @@
 /* Non-zero if we should go back to the last prompt. */
 
 /**/
-int dolastprompt;
+mod_export int dolastprompt;
 
 /* Non-zero if we should keep an old list. */
 
 /**/
-mod_export
-int oldlist, oldins;
+mod_export int oldlist, oldins;
 
 /* This is used to decide when the cursor should be moved to the end of    *
  * the inserted word: 0 - never, 1 - only when a single match is inserted, *
Index: Src/Zle/compresult.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/compresult.c,v
retrieving revision 1.12
diff -u -r1.12 compresult.c
--- Src/Zle/compresult.c	2000/04/27 08:21:10	1.12
+++ Src/Zle/compresult.c	2000/04/30 17:52:53
@@ -540,7 +540,7 @@
  * braces. */
 
 /**/
-int
+mod_export int
 hasbrpsfx(Cmatch m, char *pre, char *suf)
 {
     char *op = lastprebr, *os = lastpostbr;
@@ -1148,7 +1148,7 @@
 /* This skips over matches that are not to be listed. */
 
 /**/
-Cmatch *
+mod_export Cmatch *
 skipnolist(Cmatch *p, int showall)
 {
     int mask = (showall ? 0 : (CMF_NOLIST | CMF_MULT)) | CMF_HIDE;

Re: PATCH: AIX dependencies and AIX compile problem

[Bart Schaefer]

On Apr 30,  6:54pm, Oliver Kiddle wrote:
} Subject: PATCH: AIX dependencies and AIX compile problem
}
} There may be more to come because I haven't yet got a clean compile: I get
} an error message for lines 925 and 968 of init.c saying 'Operands must be
} pointers to compatible types'

It's just a signed/unsigned thing.

--- zsh-forge/current/Src/init.c	Thu Apr  6 08:28:31 2000
+++ Src/init.c	Sun Apr 30 11:40:26 2000
@@ -905,7 +905,7 @@
     int oldshst, osubsh, oloops;
     FILE *obshin;
     char *old_scriptname = scriptname, *us;
-    char *ocs;
+    unsigned char *ocs;
     int ocsp;
 
     if (!s || 

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com