debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FreeBSD 11: Fix clang (v6) builds

Browse Source 
While CDE builds fine with gcc6 on FreeBSD 11, the default clang build
was broken in a few places.  This commit allows CDE to build now using
the default clang 6 system compiler.
This commit is contained in:
Jon Trulson
2018-06-15 00:00:46 +00:00
parent 825a504a11
commit ac883b6972
4 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
View File

@@ -511,7 +511,7 @@ int _Tt_types_table::yyparse(void)
int _Tt_types_table::yyparse()
#endif
{
register YYSTYPE *yypvt; /* top of value stack for $vars */
YYSTYPE *yypvt; /* top of value stack for $vars */
#if defined(__cplusplus) || defined(lint)
/*
@@ -550,10 +550,10 @@ int _Tt_types_table::yyparse()
#endif
{
register YYSTYPE *yy_pv; /* top of value stack */
register int *yy_ps; /* top of state stack */
register int yy_state; /* current state */
register int yy_n; /* internal state number info */
YYSTYPE *yy_pv; /* top of value stack */
int *yy_ps; /* top of state stack */
int yy_state; /* current state */
int yy_n; /* internal state number info */
goto yystack; /* moved from 6 lines above to here to please C++ */
/*
@@ -591,7 +591,7 @@ int _Tt_types_table::yyparse()
*/
if ( yydebug )
{
register int yy_i;
int yy_i;
printf( "State %d, token ", yy_state );
if ( yychar == 0 )
@@ -675,7 +675,7 @@ int _Tt_types_table::yyparse()
#if YYDEBUG
if ( yydebug && yytmp )
{
register int yy_i;
int yy_i;
printf( "Received token " );
if ( yychar == 0 )
@@ -717,7 +717,7 @@ int _Tt_types_table::yyparse()
#if YYDEBUG
if ( yydebug && yytmp )
{
register int yy_i;
int yy_i;
printf( "Received token " );
if ( yychar == 0 )
@@ -744,7 +744,7 @@ int _Tt_types_table::yyparse()
** look through exception table
*/
{
register int *yyxi = yyexca;
int *yyxi = yyexca;
while ( ( *yyxi != -1 ) ||
( yyxi[1] != yy_state ) )
@@ -830,7 +830,7 @@ int _Tt_types_table::yyparse()
*/
if ( yydebug )
{
register int yy_i;
int yy_i;
printf( "Error recovery discards " );
if ( yychar == 0 )
@@ -879,7 +879,7 @@ int _Tt_types_table::yyparse()
/*
** Look in goto table for next state
** Sorry about using yy_state here as temporary
** register variable, but why not, if it works...
** variable, but why not, if it works...
** If yyr2[ yy_n ] doesn't have the low order bit
** set, then there is no action to be done for
** this reduction. So, no saving & unsaving of
@@ -890,7 +890,7 @@ int _Tt_types_table::yyparse()
*/
{
/* length of production doubled with extra bit */
register int yy_len = yyr2[ yy_n ];
int yy_len = yyr2[ yy_n ];
if ( !( yy_len & 01 ) )
{

14
cde/lib/tt/bin/tt_type_comp/frozen.mp_types_lex.C
View File

@@ -65,16 +65,6 @@ extern "C" {
}
#endif
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(__linux__)
void exit(int);
#endif
#ifdef __cplusplus
}
#endif
#endif
# define yymore() (yymorfg=1)
#ifndef __cplusplus
@@ -1109,8 +1099,8 @@ int _Tt_types_table::yylook(void)
int _Tt_types_table::yylook()
#endif
{
register struct yysvf *yystate, **lsp;
register struct yywork *yyt;
struct yysvf *yystate, **lsp;
struct yywork *yyt;
struct yysvf *yyz;
int yych, yyfirst;
struct yywork *yyr;