ChangeLogTag:Tue Jul 31 16:43:33 2001 Ossama Othman <ossama@uci.edu>

9 files changed, 64 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index a825123edbd..833f8e740d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Tue Jul 31 16:43:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Basic_Types.h:
+
+	  If "__LITTLE_ENDIAN__" is defined then assume that the
+	  architecture is little endian.  Some compilers/platforms define
+	  that macro.  Suggested by Frank Wolf" <fwolf@gum.de>.
+
+	* ace/Svc_Conf.h (yy_push_buffer):
+	* ace/Svc_Conf.l (yy_push_buffer):
+	* ace/Svc_Conf_l.cpp (ace_yy_push_buffer):
+	* ace/Svc_Conf_Lexer_Guard.cpp (ACE_Svc_Conf_Lexer_Guard):
+	* ace/Svc_Conf_Lexer_Guard.h (ACE_Svc_Conf_Lexer_Guard):
+
+	  The Service Configurator directive is an "ACE_TCHAR *" not a
+	  "char *".  Updated these method/function parameters to accept
+	  the former.  Fixes a compile-time problem on "wchar/Unicode"
+	  builds.
+
 Tue Jul 31 05:34:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/OS.h: Removed a spurious WNOHANG definition.  Thanks to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a825123edbd..833f8e740d8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Tue Jul 31 16:43:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Basic_Types.h:
+
+	  If "__LITTLE_ENDIAN__" is defined then assume that the
+	  architecture is little endian.  Some compilers/platforms define
+	  that macro.  Suggested by Frank Wolf" <fwolf@gum.de>.
+
+	* ace/Svc_Conf.h (yy_push_buffer):
+	* ace/Svc_Conf.l (yy_push_buffer):
+	* ace/Svc_Conf_l.cpp (ace_yy_push_buffer):
+	* ace/Svc_Conf_Lexer_Guard.cpp (ACE_Svc_Conf_Lexer_Guard):
+	* ace/Svc_Conf_Lexer_Guard.h (ACE_Svc_Conf_Lexer_Guard):
+
+	  The Service Configurator directive is an "ACE_TCHAR *" not a
+	  "char *".  Updated these method/function parameters to accept
+	  the former.  Fixes a compile-time problem on "wchar/Unicode"
+	  builds.
+
 Tue Jul 31 05:34:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/OS.h: Removed a spurious WNOHANG definition.  Thanks to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a825123edbd..833f8e740d8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,22 @@
+Tue Jul 31 16:43:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Basic_Types.h:
+
+	  If "__LITTLE_ENDIAN__" is defined then assume that the
+	  architecture is little endian.  Some compilers/platforms define
+	  that macro.  Suggested by Frank Wolf" <fwolf@gum.de>.
+
+	* ace/Svc_Conf.h (yy_push_buffer):
+	* ace/Svc_Conf.l (yy_push_buffer):
+	* ace/Svc_Conf_l.cpp (ace_yy_push_buffer):
+	* ace/Svc_Conf_Lexer_Guard.cpp (ACE_Svc_Conf_Lexer_Guard):
+	* ace/Svc_Conf_Lexer_Guard.h (ACE_Svc_Conf_Lexer_Guard):
+
+	  The Service Configurator directive is an "ACE_TCHAR *" not a
+	  "char *".  Updated these method/function parameters to accept
+	  the former.  Fixes a compile-time problem on "wchar/Unicode"
+	  builds.
+
 Tue Jul 31 05:34:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/OS.h: Removed a spurious WNOHANG definition.  Thanks to
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 1264045db5a..c8d34cad634 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -571,7 +571,7 @@ typedef ACE_UINT16 ACE_USHORT16;
 # else /* ! BYTE_ORDER && ! __BYTE_ORDER */
   // We weren't explicitly told, so we have to figure it out . . .
 #   if defined (i386) || defined (__i386__) || defined (_M_IX86) || \
-     defined (vax) || defined (__alpha)
+     defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__)
     // We know these are little endian.
 #     define ACE_LITTLE_ENDIAN 0x0123
 #     define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 0272b82e1e9..d4d82da1112 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -67,7 +67,7 @@ void ace_yy_push_buffer (FILE *file);
 
 /// Create and push a new lexer buffer on to the buffer stack for use
 /// when scanning the given directive.
-void ace_yy_push_buffer (const char *directive);
+void ace_yy_push_buffer (const ACE_TCHAR *directive);
 
 /// Pop the current lexer buffer off of the buffer stack and
 /// deallocate it.
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
index f3098c048bc..b09d5c194f7 100644
--- a/ace/Svc_Conf.l
+++ b/ace/Svc_Conf.l
@@ -126,7 +126,7 @@ yy_push_buffer (FILE *file)
 }
 
 void
-yy_push_buffer (const char *directive)
+yy_push_buffer (const ACE_TCHAR *directive)
 {
   // External synchronization is required.
 
diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp
index 91724882ef7..b498bd855c1 100644
--- a/ace/Svc_Conf_Lexer_Guard.cpp
+++ b/ace/Svc_Conf_Lexer_Guard.cpp
@@ -15,7 +15,7 @@ ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (FILE *file)
   ::ace_yy_push_buffer (file);
 }
 
-ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (const char *directive)
+ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (const ACE_TCHAR *directive)
 {
   // External synchronization is required.
 
diff --git a/ace/Svc_Conf_Lexer_Guard.h b/ace/Svc_Conf_Lexer_Guard.h
index 988e302ae6e..a200c83b2d1 100644
--- a/ace/Svc_Conf_Lexer_Guard.h
+++ b/ace/Svc_Conf_Lexer_Guard.h
@@ -55,7 +55,7 @@ public:
    * Configurator directive, push it onto the underlying buffer stack,
    * and make it the current buffer.
    */
-  ACE_Svc_Conf_Lexer_Guard (const char *directive);
+  ACE_Svc_Conf_Lexer_Guard (const ACE_TCHAR *directive);
 
   /// Destructor
   /**
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 3c2c5523cb9..f4568e21d2b 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -868,7 +868,7 @@ case 19:
 ACE_YY_RULE_SETUP
 #line 60 "Svc_Conf.l"
 { // Check for first type of string, i.e.,
-                        // "double quotes" delimited.  
+                        // "double quotes" delimited.
                         ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"');
                         if (s == 0)
                           // Check for second type of string, i.e.,
@@ -913,7 +913,7 @@ case 24:
 ACE_YY_RULE_SETUP
 #line 85 "Svc_Conf.l"
 { ACE_ERROR ((LM_ERROR,
-                                ACE_LIB_TEXT ("unknown character = (%d"), 
+                                ACE_LIB_TEXT ("unknown character = (%d"),
                                           *ace_yytext));
                         if (ACE_OS::ace_isprint (*ace_yytext))
                           ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext));