changed include protection from #if !defined to ifndef, and added #pragma once, if possible

1 files changed, 21 insertions, 20 deletions

diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index f7fe6a3ee5d..78cabe6d039 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
 //    Svc_Conf.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #ifndef ACE_SVC_CONF_H
@@ -21,13 +21,14 @@
 // Service Configurator utility.
 
 #include "ace/Obstack.h"
-#include "ace/Service_Config.h"
-#include "ace/Parse_Node.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-   
+
+#include "ace/Service_Config.h"
+#include "ace/Parse_Node.h"
+
 #if defined (DEBUGGING)
 #if defined (ACE_YY_DECL)
 #undef ACE_YY_DECL
@@ -38,16 +39,16 @@
 #endif /* DEBUGGING */
 
 void ace_yyrestart (FILE *);
-// Restart input file parsing 
+// Restart input file parsing
 
 int ace_yyparse (void);
-// Performs the parsing 
+// Performs the parsing
 
 ACE_YY_DECL;
-// Performs the lexical analysis 
+// Performs the lexical analysis
 
 extern FILE *ace_yyin;
-// Name of input stream 
+// Name of input stream
 
 #define ACE_YY_INPUT(buf,result,max_size) \
   if (ace_yydirective != 0) \
@@ -67,40 +68,40 @@ extern FILE *ace_yyin;
     ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
 
 void ace_yyerror (const char *);
-// Error handling routine required by YACC or BISON 
+// Error handling routine required by YACC or BISON
 
 extern int ace_yylineno;
-// Keeps track of the current line number for error-handling routine 
+// Keeps track of the current line number for error-handling routine
 
 extern int ace_yyerrno;
-// Keeps track of the number of errors encountered so far 
+// Keeps track of the number of errors encountered so far
 
 extern const ASYS_TCHAR *ace_yydirective;
 // Used to parse service configurator directives from a string rather
 // than from a svc.conf file.
 
 extern char *ace_yytext;
-// Holds the lexeme for the current token 
+// Holds the lexeme for the current token
 
 extern int ace_yyleng;
-// Holds the length of the lexeme for the current token 
+// Holds the length of the lexeme for the current token
 
 extern ACE_Obstack *ace_obstack;
-// Efficient memory allocation technique 
+// Efficient memory allocation technique
 
 ACE_Service_Type_Impl *ace_create_service_type (const ASYS_TCHAR *, int,
                                                 void *, unsigned int,
                                                 ACE_Service_Object_Exterminator = 0);
-// Factory that creates a new ACE_Service_Type_Impl. 
+// Factory that creates a new ACE_Service_Type_Impl.
 
-typedef union 
+typedef union
 {
   int type_;
   ACE_Location_Node *location_node_;
   ACE_Parse_Node *parse_node_;
   ACE_Static_Node *static_node_;
   ACE_Service_Type *svc_record_;
-  char *ident_; 
+  char *ident_;
 } ACE_YYSTYPE;
 extern ACE_YYSTYPE ace_yylval;
 #endif /* ACE_SVC_CONF_H */