Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).

1 files changed, 6 insertions, 0 deletions

diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index cb91bac90de..0ed758e9df7 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -114,6 +114,7 @@ public:
   /// Release the standard handles previously set with set_handles;
   void release_handles (void);
 
+#ifndef ACE_LACKS_VA_FUNCTIONS
   /// @param format must be of the form "VARIABLE=VALUE".  There can not be
   /// any spaces between VARIABLE and the equal sign.
   int setenv (const ACE_TCHAR *format,
@@ -130,6 +131,7 @@ public:
   int setenv (const ACE_TCHAR *variable_name,
               const ACE_TCHAR *format,
               ...);
+#endif // ACE_LACKS_VA_FUNCTIONS
 
   /// Same as above with argv format.  @a envp must be null terminated.
   int setenv (ACE_TCHAR *envp[]);
@@ -143,6 +145,7 @@ public:
   void working_directory (const wchar_t *wd);
 #endif /* ACE_HAS_WCHAR */
 
+#ifndef ACE_LACKS_VA_FUNCTIONS
   /**
    * Set the command-line arguments.  @a format can use any printf
    * formats.  The first token in @a format should be the path to the
@@ -158,6 +161,7 @@ public:
   /// Anti-TChar version of command_line ()
   int command_line (const ACE_ANTI_TCHAR *format, ...);
 #endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
+#endif // ACE_LACKS_VA_FUNCTIONS
 
   /// Same as above in argv format.  @a argv must be null terminated.
   int command_line (const ACE_TCHAR * const argv[]);
@@ -662,6 +666,8 @@ public:
   /// Cleanup by deleting @c this.
   virtual void unmanage (void);
 
+  ACE_ALLOC_HOOK_DECLARE;
+
 protected:
 
   /// Make sure that we're allocated dynamically!