s3: we have clock_gettime everywhere, remove ifdefs

diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index e9015ffc78b61e3c5e96370ccb19147fe3980e2a..60764794fc54d23f86409a61716a10a88aaeef3a 100644 (file)
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -894,8 +894,6 @@ extern bool do_profile_times;
 #define DEC_PROFILE_COUNT(x) profile_p->x--
 #define ADD_PROFILE_COUNT(x,y) profile_p->x += (y)
 
-#if defined(HAVE_CLOCK_GETTIME)
-
 extern clockid_t __profile_clock;
 
 static inline uint64_t profile_timestamp(void)
@@ -911,17 +909,6 @@ static inline uint64_t profile_timestamp(void)
        return (ts.tv_sec * 1000000) + (ts.tv_nsec / 1000); /* usec */
 }
 
-#else
-
-static inline uint64_t profile_timestamp(void)
-{
-       struct timeval tv;
-       GetTimeOfDay(&tv);
-       return (tv.tv_sec * 1000000) + tv.tv_usec;
-}
-
-#endif
-
 /* end of helper macros */
 
 #define DO_PROFILE_INC(x) \

diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index c8e7c38da7a1657e06a86907ce7c6302eac15372..4a61753ea388e553011d19af8128bc97ac36d792 100644 (file)
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -29,11 +29,9 @@
 #ifdef WITH_PROFILE
 static int shm_id;
 static bool read_only;
-#if defined(HAVE_CLOCK_GETTIME)
 clockid_t __profile_clock;
 bool have_profiling_clock = False;
 #endif
-#endif
 
 struct profile_header *profile_h;
 struct profile_stats *profile_p;
@@ -138,8 +136,6 @@ static void reqprofile_message(struct messaging_context *msg_ctx,
   open the profiling shared memory area
   ******************************************************************/
 
-#ifdef HAVE_CLOCK_GETTIME
-
 /* Find a clock. Just because the definition for a particular clock ID is
  * present doesn't mean the system actually supports it.
  */
@@ -195,7 +191,6 @@ static void init_clock_gettime(void)
                ("could not find a working clock for profiling"));
        return;
 }
-#endif
 
 bool profile_setup(struct messaging_context *msg_ctx, bool rdonly)
 {
@@ -203,9 +198,7 @@ bool profile_setup(struct messaging_context *msg_ctx, bool rdonly)
 
        read_only = rdonly;
 
-#ifdef HAVE_CLOCK_GETTIME
        init_clock_gettime();
-#endif
 
  again:
        /* try to use an existing key */