Changeset 6924 for trunk/libtransmission/utils.c

Timestamp:

Oct 19, 2008, 5:43:04 PM (14 years ago)

Author:

charles

Message:

further win32 portability fixes from Spry

File:

• trunk/libtransmission/utils.c (modified) (6 diffs)

trunk/libtransmission/utils.c

@@ -56 +56 @@
 static tr_msg_list ** messageQueueTail = &messageQueue;
 
+#ifndef WIN32
+    /* make null versions of these win32 functions */
+    static int IsDebuggerPresent( void ) { return FALSE; }
+    static void OutputDebugString( const void * unused UNUSED ) { }
+#endif
+
 void
 tr_msgInit( void )
@@ -157 +163 @@
 **/
 
+static struct tm *
+tr_localtime_r( time_t *_clock, struct tm *_result )
+{
+#ifdef HAVE_LOCALTIME_R
+    return localtime_r( _clock, _result );
+#else
+    struct tm *p = localtime( _clock );
+    if( p )
+        *(_result) = *p;
+    return p;
+#endif
+}
+
 char*
 tr_getLogTimeStr( char * buf,
@@ -170 +189 @@
     gettimeofday( &tv, NULL );
 
-#ifdef WIN32
-    now_tm = *localtime( &now );
-#else
-    localtime_r( &now, &now_tm );
-#endif
+    tr_localtime_r( &now, &now_tm );
     strftime( tmp, sizeof( tmp ), "%H:%M:%S", &now_tm );
     milliseconds = (int)( tv.tv_usec / 1000 );
@@ -190 +205 @@
 {
     FILE * fp = tr_getLog( );
-#ifdef WIN32
     if( fp || IsDebuggerPresent( ) )
-#else
-    if( fp )
-#endif
     {
         va_list           args;
@@ -209 +220 @@
         va_end( args );
         evbuffer_add_printf( buf, " (%s:%d)\n", base, line );
-#ifdef WIN32
         OutputDebugString( EVBUFFER_DATA( buf ) );
         if(fp)
-#endif
-        (void) fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );
+            (void) fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );
 
         tr_free( base );
@@ -255 +264 @@
         evbuffer_add_vprintf( buf, fmt, ap );
         va_end( ap );
+
+        OutputDebugString( EVBUFFER_DATA( buf ) );
 
         if( EVBUFFER_LENGTH( buf ) )