Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH] Compilation fix for AIX (missing consts)



On Tue, 26 Apr 2011 15:33:52 +0200
Jérémie Roquet <arkanosis@xxxxxxxxx> wrote:
> I've had to fix the source to compile zsh on AIX. It looks like the
> protos were wrong anyway, but gcc doesn't complain on Linux…
> I'm not sure it doesn't break some other platform, but at least these
> are the right protos for AIX, Linux and FreeBSD.
> 
> Any thoughts on this?

As Wayne says, we really need to find the headers, but until then the
following should at least be safe... although this code hasn't change
for a very long time, and it used to compile on AIX, so it's possible
there's a version issue (the other possibility is it's a
local configuration issue).

Index: Src/prototypes.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/prototypes.h,v
retrieving revision 1.5
diff -p -u -r1.5 prototypes.h
--- Src/prototypes.h	20 Dec 2010 10:28:43 -0000	1.5
+++ Src/prototypes.h	3 May 2011 10:20:43 -0000
@@ -34,12 +34,24 @@ char *calloc _((size_t, size_t));
 #endif
 
 #if !(defined(USES_TERMCAP_H) || defined(USES_TERM_H))
-extern int tgetent _((char *bp, char *name));
+/*
+ * These prototypes are only used where we don't have the
+ * headers.  In some cases they need tweaking.
+ * TBD: we'd much prefer to get hold of the header where
+ * these are defined.
+ */
+#ifdef _AIX
+#define TC_CONST const
+#else
+#define TC_CONST
+#endif
+extern int tgetent _((char *bp, TC_CONST char *name));
 extern int tgetnum _((char *id));
 extern int tgetflag _((char *id));
 extern char *tgetstr _((char *id, char **area));
-extern char *tgoto _((char *cm, int destcol, int destline));
-extern int tputs _((char *cp, int affcnt, int (*outc) (int)));
+extern char *tgoto _((TC_CONST char *cm, int destcol, int destline));
+extern int tputs _((TC_CONST char *cp, int affcnt, int (*outc) (int)));
+#undef TC_CONST
 #endif
 
 /* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */

-- 
Peter Stephenson <pws@xxxxxxx>            Software Engineer
Tel: +44 (0)1223 692070                   Cambridge Silicon Radio Limited
Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom



Messages sorted by: Reverse Date, Date, Thread, Author