Date: Mon, 14 Jan 2002 21:20:20 +0200 From: Ruslan Ermilov <ru@FreeBSD.ORG> To: Mike Tancsa <mike@sentex.net> Cc: "Andrey A. Chernov" <ache@FreeBSD.ORG>, stable@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/ncurses/ncurses/tinfo lib_baudrate.c Message-ID: <20020114212020.A80463@sunbay.com> In-Reply-To: <5.1.0.14.0.20020114134953.03848050@marble.sentex.ca> References: <200201141631.g0EGVXs60701@freefall.freebsd.org> <5.1.0.14.0.20020114134953.03848050@marble.sentex.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
NCURSES_EXPORT() isn't in RELENG_4 version of contrib/ncurses.
(censored)
Index: lib_baudrate.c
===================================================================
RCS file: /home/ncvs/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c,v
retrieving revision 1.1.1.1.2.2
diff -u -p -r1.1.1.1.2.2 lib_baudrate.c
--- lib_baudrate.c 14 Jan 2002 16:31:33 -0000 1.1.1.1.2.2
+++ lib_baudrate.c 14 Jan 2002 19:16:50 -0000
@@ -134,7 +134,7 @@ static struct speed const speeds[] =
#endif
};
-NCURSES_EXPORT(int)
+int
_nc_baudrate(int OSpeed)
{
static int last_OSpeed;
@@ -160,7 +160,7 @@ _nc_baudrate(int OSpeed)
return (result);
}
-NCURSES_EXPORT(int)
+int
_nc_ospeed(int BaudRate)
{
int result = 1;
@@ -177,7 +177,7 @@ _nc_ospeed(int BaudRate)
return (result);
}
-NCURSES_EXPORT(int)
+int
baudrate(void)
{
int result;
On Mon, Jan 14, 2002 at 01:50:57PM -0500, Mike Tancsa wrote:
> Hi,
>
> Not sure if its related to the commit yet, but doing a make -j4 buildworld,
> I get
>
> /usr/src/i386/usr/include -c
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_acs.c -o
> lib_acs.So
> cc -O -pipe -march=pentiumpro -I. -I/usr/src/lib/libncurses
> -I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses -I/usr/src
> /lib/libncurses/../../contrib/ncurses/include -Wall -DFREEBSD_NATIVE
> -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS -I/usr/obj/usr/src/i38
> 6/usr/include -c
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c
> -o lib_baudrate.o
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:138:
> syntax error before `_nc_baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:139:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:164:
> syntax error before `_nc_ospeed'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:165:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:181:
> syntax error before `baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:182:
> warning: return-type defaults to `int'
> cc -pg -O -pipe -march=pentiumpro -I. -I/usr/src/lib/libncurses
> -I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses -I/usr
> /src/lib/libncurses/../../contrib/ncurses/include -Wall -DFREEBSD_NATIVE
> -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS -I/usr/obj/usr/src
> /i386/usr/include -c
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c
> -o lib_baudrate.po
> cc -fpic -DPIC -O -pipe -march=pentiumpro -I. -I/usr/src/lib/libncurses
> -I/usr/src/lib/libncurses/../../contrib/ncurses/ncurse
> s -I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
> -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS -I/usr/obj
> /usr/src/i386/usr/include -c
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c
> -o lib_baudrate.So
> *** Error code 1
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:138:
> syntax error before `_nc_baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:138:
> syntax error before `_nc_baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:139:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:139:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:164:
> syntax error before `_nc_ospeed'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:165:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:181:
> syntax error before `baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:182:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:164:
> syntax error before `_nc_ospeed'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:165:
> warning: return-type defaults to `int'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:181:
> syntax error before `baudrate'
> /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c:182:
> warning: return-type defaults to `int'
> *** Error code 1
> *** Error code 1
> 3 errors
> *** Error code 2
> 1 error
> *** Error code 2
> 1 error
> *** Error code 2
>
> At 08:31 AM 1/14/02 -0800, Andrey A. Chernov wrote:
> >ache 2002/01/14 08:31:33 PST
> >
> > Modified files: (Branch: RELENG_4)
> > contrib/ncurses/ncurses/tinfo lib_baudrate.c
> > Log:
> > MFC: official baudrate fix
> >
> > Revision Changes Path
> > 1.1.1.1.2.2 +50 -10 src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
> >
--
Ruslan Ermilov Oracle Developer/DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020114212020.A80463>