Mon Apr 20 18:08:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/ETCL/ETCL_l.cpp:
        * ace/ETCL/ETCL_l.cpp.diff:
          Added a cast for WinCE with GCC

3 files changed, 63 insertions, 57 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 612752dcfcd..6f5ea5974fd 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 20 18:08:06 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ETCL/ETCL_l.cpp:
+        * ace/ETCL/ETCL_l.cpp.diff:
+          Added a cast for WinCE with GCC
+
 Mon Apr 20 17:47:06 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/WFMO_Reactor.cpp:
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index 9ebb522747c..2068cdbaf6b 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -1542,7 +1542,7 @@ FILE *file;
 
 #if defined (ACE_HAS_WINCE)
     // Mimic the behavior as WinCE does not have isatty().
-    if ((file != 0) && (file == fileno(file))) {
+    if ((file != 0) && (file == (FILE*)fileno(file))) {
         b->yy_is_interactive = 1;
     }
     else {
diff --git a/ACE/ace/ETCL/ETCL_l.cpp.diff b/ACE/ace/ETCL/ETCL_l.cpp.diff
index 9709c130de2..1dd981dd9d5 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp.diff
+++ b/ACE/ace/ETCL/ETCL_l.cpp.diff
@@ -3,35 +3,35 @@
 @@ -1,15 +1,14 @@
 +
  /* A lexical scanner generated by flex */
- 
+
  /* Scanner skeleton version:
 - * $Header$
 + * $Id$
   */
- 
+
  #define FLEX_SCANNER
  #define YY_FLEX_MAJOR_VERSION 2
  #define YY_FLEX_MINOR_VERSION 5
- 
+
 -#include <stdio.h>
 -
- 
+
  /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
  #ifdef c_plusplus
 @@ -21,8 +20,7 @@
- 
+
  #ifdef __cplusplus
- 
+
 -#include <stdlib.h>
 -#include <unistd.h>
 +#include "ace/OS.h"
- 
+
  /* Use prototypes in function declarations. */
  #define YY_USE_PROTOS
 @@ -262,8 +260,8 @@
  #define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
- 
- 
+
+
 -#define yywrap() 1
 -#define YY_SKIP_YYWRAP
 +//#define yywrap() 1
@@ -53,7 +53,7 @@
  //
  // = LIBRARY
  //   orbsvcs/ECTL
--// 
+-//
 +//
  // = FILENAME
  //   ETCL.ll
@@ -61,37 +61,37 @@
 @@ -462,12 +460,12 @@
  //
  // ========================================================================
- 
+
 -#include "ace/OS.h"
 -
 +#include "ETCL_Interpreter.h"
  #include "ETCL_Constraint.h"
  #include "ETCL_y.h"
- 
+
 -static const char * extract_string(char*);
 +static const char* extract_string(char*);
 +//static const char * extract_string(char*);
- 
+
  #define TAO_YY_LEX_DEBUG
- 
+
 @@ -475,12 +473,11 @@
  #define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
  #endif /* TAO_CONSTRAINT_DEBUG */
- 
+
 -#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
 +//#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
- 
+
  #define YY_BREAK
  #define YY_NO_UNPUT
- 
+
 -#line 484 "lex.yy.c"
- 
+
  /* Macros after this point can all be overridden by user definitions in
   * section 1.
 @@ -494,10 +491,6 @@
  #endif
  #endif
- 
+
 -#ifndef YY_NO_UNPUT
 -static void yyunput YY_PROTO(( int c, char *buf_ptr ));
 -#endif
@@ -100,9 +100,9 @@
  static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
  #endif
 @@ -556,11 +549,11 @@
- 
+
  /* Copy whatever the last rule matched to the standard output. */
- 
+
 -#ifndef ECHO
 +#ifndef TAO_ETCL_ECHO
  /* This used to be an fputs(), but since the string might contain NUL's,
@@ -111,7 +111,7 @@
 -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 +#define TAO_ETCL_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
  #endif
- 
+
  /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
 @@ -628,13 +621,11 @@
  YY_DECL
@@ -121,17 +121,17 @@
 +	register char *yy_cp = 0;
 +  register char *yy_bp = 0;
  	register int yy_act;
- 
+
 -#line 50 "ETCL.ll"
 -
 -
 -#line 638 "lex.yy.c"
 +//#line 50 "ETCL/ETCL.ll"
- 
+
  	if ( yy_init )
  		{
 @@ -719,240 +710,239 @@
- 
+
  case 1:
  YY_RULE_SETUP
 -#line 52 "ETCL.ll"
@@ -327,8 +327,8 @@
  case 33:
  YY_RULE_SETUP
 -#line 84 "ETCL.ll"
--{ 
--		  lvalp->constraint = 
+-{
+-		  lvalp->constraint =
 +//#line 84 "ETCL/ETCL.ll"
 +{
 +		  yylval.constraint =
@@ -339,8 +339,8 @@
  case 34:
  YY_RULE_SETUP
 -#line 89 "ETCL.ll"
--{ 
--		  lvalp->constraint = 
+-{
+-		  lvalp->constraint =
 +//#line 89 "ETCL/ETCL.ll"
 +{
 +		  yylval.constraint =
@@ -351,13 +351,13 @@
  case 35:
  YY_RULE_SETUP
 -#line 94 "ETCL.ll"
--{ 
--		  lvalp->constraint = 
+-{
+-		  lvalp->constraint =
 +//#line 94 "ETCL/ETCL.ll"
 +{
 +		  yylval.constraint =
  		    new TAO_ETCL_Literal_Constraint (ACE_OS::atoi (yytext));
--		  TAO_YY_LEX_DEBUG; return TAO_ETCL_INTEGER; 
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_INTEGER;
 +		  TAO_YY_LEX_DEBUG; return TAO_ETCL_INTEGER;
  		}
  	YY_BREAK
@@ -367,22 +367,22 @@
 +//#line 99 "ETCL/ETCL.ll"
  {
  		  double v;
--		  sscanf (yytext, "%lf", &v); 
--		  lvalp->constraint = 
+-		  sscanf (yytext, "%lf", &v);
+-		  lvalp->constraint =
 +		  sscanf (yytext, "%lf", &v);
 +		  yylval.constraint =
  		    new TAO_ETCL_Literal_Constraint (v);
--		  TAO_YY_LEX_DEBUG; return TAO_ETCL_FLOAT; 
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_FLOAT;
 +		  TAO_YY_LEX_DEBUG; return TAO_ETCL_FLOAT;
  		}
  	YY_BREAK
  case 37:
  YY_RULE_SETUP
 -#line 106 "ETCL.ll"
--{ 
+-{
 -		  lvalp->constraint =
 -		    new TAO_ETCL_Literal_Constraint (extract_string (yytext));
--		  TAO_YY_LEX_DEBUG; return TAO_ETCL_STRING; 
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_STRING;
 +//#line 106 "ETCL/ETCL.ll"
 +{
 +		  yylval.constraint =
@@ -393,20 +393,20 @@
  case 38:
  YY_RULE_SETUP
 -#line 111 "ETCL.ll"
--{ 
--		  lvalp->constraint = 
+-{
+-		  lvalp->constraint =
 +//#line 111 "ETCL/ETCL.ll"
 +{
 +		  yylval.constraint =
  		    new TAO_ETCL_Identifier (yytext);
--		  TAO_YY_LEX_DEBUG; return TAO_ETCL_IDENT; 
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_IDENT;
 +		  TAO_YY_LEX_DEBUG; return TAO_ETCL_IDENT;
  		}
  	YY_BREAK
  case 39:
  YY_RULE_SETUP
 -#line 116 "ETCL.ll"
--{ 
+-{
 +//#line 116 "ETCL/ETCL.ll"
 +{
                    TAO_YY_LEX_DEBUG; break; // Ignore
@@ -415,7 +415,7 @@
  case 40:
  YY_RULE_SETUP
 -#line 119 "ETCL.ll"
--{ 
+-{
 +//#line 119 "ETCL/ETCL.ll"
 +{
                    TAO_YY_LEX_DEBUG; break; // @@ TODO
@@ -431,11 +431,11 @@
 -#line 956 "lex.yy.c"
  case YY_STATE_EOF(INITIAL):
  	yyterminate();
- 
+
 @@ -1288,7 +1278,7 @@
  	return yy_is_jam ? 0 : yy_current_state;
  	}
- 
+
 -
 +#if 0
  #ifndef YY_NO_UNPUT
@@ -447,37 +447,37 @@
  #endif	/* ifndef YY_NO_UNPUT */
 -
 +#endif /* 0 */
- 
+
  #ifdef __cplusplus
  static int yyinput()
 @@ -1406,6 +1396,11 @@
  	return c;
  	}
- 
+
 +void yyflush_current_buffer (void)
 +{
 +	YY_FLUSH_BUFFER;
 +}
 +
- 
+
  #ifdef YY_USE_PROTOS
  void yyrestart( FILE *input_file )
 @@ -1516,11 +1511,6 @@
  	}
- 
- 
+
+
 -#ifndef YY_ALWAYS_INTERACTIVE
 -#ifndef YY_NEVER_INTERACTIVE
 -extern int isatty YY_PROTO(( int ));
 -#endif
 -#endif
- 
+
  #ifdef YY_USE_PROTOS
  void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
 @@ -1537,15 +1527,18 @@
  	b->yy_input_file = file;
  	b->yy_fill_buffer = 1;
- 
+
 -#if YY_ALWAYS_INTERACTIVE
 -	b->yy_is_interactive = 1;
 -#else
@@ -485,7 +485,7 @@
 -	b->yy_is_interactive = 0;
 +#if defined (ACE_HAS_WINCE)
 +    // Mimic the behavior as WinCE does not have isatty().
-+    if ((file != 0) && (file == fileno(file))) {
++    if ((file != 0) && (file == (FILE*)fileno(file))) {
 +        b->yy_is_interactive = 1;
 +    }
 +    else {
@@ -498,14 +498,14 @@
 +#endif  // ACE_HAS_WINCE
 +
  	}
- 
- 
+
+
 @@ -1838,7 +1831,7 @@
  	return 0;
  	}
  #endif
 -#line 122 "ETCL.ll"
 +//#line 122 "ETCL/ETCL.ll"
- 
- 
+
+
  const char*