diff options
Diffstat (limited to 'ace/OS.h')
| -rw-r--r-- | ace/OS.h | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -4264,9 +4264,9 @@ public: mode_t perms = 0); static int flock_destroy (ACE_OS::ace_flock_t *lock); #if defined (ACE_WIN32) - static void adjust_flock_params (ACE_OS::ace_flock_t *lock, - short whence, - off_t &start, + static void adjust_flock_params (ACE_OS::ace_flock_t *lock, + short whence, + off_t &start, off_t &len); #endif /* ACE_WIN32 */ static int flock_rdlock (ACE_OS::ace_flock_t *lock, @@ -5597,13 +5597,7 @@ extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args); # define ACE_MAIN main # endif /* ! ACE_MAIN */ -# if defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) -# if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) -# define ACE_HAS_NONSTATIC_OBJECT_MANAGER -# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ -# endif /* ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ - -# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) +# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) // Rename "main ()" on platforms that don't allow it to be called "main ()". // Also, create an ACE_Object_Manager static instance in "main ()". # include "ace/Object_Manager.h" @@ -5661,7 +5655,7 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., "main" */ \ int \ ace_main_i # endif /* ACE_PSOSIM */ -# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ # if defined (ACE_HAS_WINCE) # include "ace/Object_Manager.h" |