chg: dev: cleanup timeval bits !wip

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>

Author: sarnold

CMakeLists.txt

@@ -209,6 +209,13 @@ if(WIN32)
             )
         endif()
     endif()
+
+#    set(TVAL_INCLUDES inc/sys_time_h)
+#    include_directories(${TVAL_INCLUDES})
+#    if(ABC_USE_NAMESPACE)
+#        set_source_files_properties(${TVAL_INCLUDES}/sys/time.h PROPERTIES LANGUAGE CXX)
+#    endif()
+
     target_compile_definitions(abc_interface
         INTERFACE
             $<$<BOOL:${ABC_USE_NO_PTHREADS}>:HAVE_STRUCT_TIMESPEC>

src/opt/ufar/UfarCmd.cpp

@@ -5,7 +5,7 @@
  *      Author: Yen-Sheng Ho
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <windows.h>
 #else
 #include <sys/time.h>
@@ -166,7 +166,7 @@ static int Abc_CommandProveUsingUif( Abc_Frame_t * pAbc, int argc, char ** argv
     if(!opt_mgr.Parse(argc, argv)) {
         opt_mgr.PrintUsage();
         cout << "\n       This command was developed by Yen-Sheng Ho at UC Berkeley in 2015.\n";
-        cout << "       https://people.eecs.berkeley.edu/~alanmi/publications/2016/fmcad16_uif.pdf \n"; 
+        cout << "       https://people.eecs.berkeley.edu/~alanmi/publications/2016/fmcad16_uif.pdf \n";
         return 0;
     }
 

src/opt/ufar/UfarMgr.cpp

@@ -15,8 +15,10 @@
 #include <regex>
 #include <queue>
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <windows.h>
+#else
+#include <sys/time.h>
 #endif
 
 #include <base/wlc/wlc.h>
@@ -530,7 +532,7 @@ void SimUifPairFinder::AddPair(const UIF_PAIR& x) {
 
     if(x.fMark)
         _mat_pairwise_matches[x.second.idx][x.first.idx] += nThreshold;
-    else 
+    else
         _mat_pairwise_matches[x.first.idx][x.second.idx] += nThreshold;
 }
 int  SimUifPairFinder::GetCount(const UIF_PAIR& x) const {

src/opt/ufar/UfarMgr.h

@@ -15,15 +15,8 @@
 #include <sstream>
 #include <iostream>
 #include <memory>
+
 #if defined(_WIN32) && !defined(__MINGW32__)
-// Define timeval before windows.h to prevent winsock.h forward declaration conflicts
-#ifndef _TIMEVAL_DEFINED
-#define _TIMEVAL_DEFINED
-struct timeval {
-    long tv_sec;
-    long tv_usec;
-};
-#endif
 #include <windows.h>
 #else
 #include <sys/time.h>

src/opt/util/util.h

@@ -17,30 +17,7 @@
 #include <vector>
 
 #if defined(_WIN32) && !defined(__MINGW32__)
-// Define timeval before windows.h to prevent winsock.h forward declaration conflicts
-#ifndef _TIMEVAL_DEFINED
-#define _TIMEVAL_DEFINED
-struct timeval {
-    long tv_sec;
-    long tv_usec;
-};
-#endif
 #include <windows.h>
-
-static inline int gettimeofday(struct timeval *tv, struct timezone *tz) {
-    if (tv) {
-        FILETIME ft;
-        GetSystemTimeAsFileTime(&ft);
-        ULARGE_INTEGER uli;
-        uli.LowPart = ft.dwLowDateTime;
-        uli.HighPart = ft.dwHighDateTime;
-        ULONGLONG time_in_us = (uli.QuadPart - 116444736000000000ULL) / 10ULL;
-        tv->tv_sec = (long)(time_in_us / 1000000ULL);
-        tv->tv_usec = (long)(time_in_us % 1000000ULL);
-    }
-    (void)tz;
-    return 0;
-}
 #else
 #include <sys/time.h>
 #endif