[Asterisk-cvs] asterisk/editline Makefile.in,1.3,1.4 sys.h,1.1,1.2

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/editline
In directory mongoose.digium.com:/tmp/cvs-serv25047/editline

Modified Files:
	Makefile.in sys.h 
Log Message:
Merge slimey's Solaris compatibility (with small mods) (bug #2740)


Index: Makefile.in
===================================================================
RCS file: /usr/cvsroot/asterisk/editline/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	2 Feb 2004 07:01:25 -0000	1.3
+++ Makefile.in	14 Dec 2004 23:36:30 -0000	1.4
@@ -2,6 +2,8 @@
 # Generic Makefile for libedit.
 #
 
+OSTYPE=$(shell uname -s)
+
 SHELL = /bin/sh
 
 CC = @CC@
@@ -18,6 +20,10 @@
 INSTALL = @INSTALL@
 PREFIX = @prefix@
 
+ifeq ($(OSTYPE),SunOS)
+CFLAGS+=-DSOLARIS -I../include/solaris-compat
+endif
+
 # .c files.
 ACSRCS = @ACSRCS@
 BCSRCS = @BCSRCS@

Index: sys.h
===================================================================
RCS file: /usr/cvsroot/asterisk/editline/sys.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sys.h	27 Nov 2002 05:04:07 -0000	1.1
+++ sys.h	14 Dec 2004 23:36:30 -0000	1.2
@@ -96,10 +96,12 @@
 /*
  * Broken hdrs.
  */
+#ifndef SOLARIS
 extern int	tgetent(const char *bp, char *name);
 extern int	tgetflag(const char *id);
 extern int	tgetnum(const char *id);
 extern char    *tgetstr(const char *id, char **area);
+#endif
 extern char    *tgoto(const char *cap, int col, int row);
 extern int	tputs(const char *str, int affcnt, int (*putc)(int));
 extern char    *getenv(const char *);