shared

src/inc/smallut.h

@@ -94,6 +94,10 @@ bool wchartoutf8(const wchar_t *in, std::string& out, int len = 0);
 std::string wchartoutf8(const wchar_t *in, int len = 0);
 bool utf8towchar(const std::string& in, wchar_t *out, int obytescap);
 std::unique_ptr<wchar_t[]> utf8towchar(const std::string& in);
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define localtime_r(a,b) localtime_s(b,a)
+#define strtok_r strtok_s
 #endif // _WIN32
 
 /** Note for all templated functions:
@@ -286,6 +290,8 @@ extern std::string pc_decode(const std::string&);
 /// start meaning count from the end).
 bool parseHTTPRanges(const std::string& ranges, std::vector<std::pair<int64_t, int64_t>>& oranges);
 
+void millisleep(int millis);
+
 
 } // End namespace MedocUtils
 

src/utils/smallut.cpp

@@ -15,6 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *   02110-1301 USA
  */
+#ifdef BUILDING_RECOLL
+#include "autoconfig.h"
+#else
+#include "config.h"
+#endif
+
 #include "smallut.h"
 
 #include <algorithm>
@@ -46,11 +52,6 @@
 
 
 #ifdef _WIN32
-#ifdef _MSC_VER
-#define strncasecmp _strnicmp
-#define strcasecmp _stricmp
-#define localtime_r(a,b) localtime_s(b,a)
-#endif // _MSC_VER
 
 #define WIN32_LEAN_AND_MEAN
 #define NOGDI
@@ -946,8 +947,12 @@ static void unsetenv(const char* name)
 {
     _putenv_s(name, "");
 }
-#endif
-
+#ifdef _MSC_VER
+time_t portable_timegm(struct tm *tm)
+{
+    return _mkgmtime(tm);
+}
+#else
 time_t portable_timegm(struct tm *tm)
 {
     time_t ret;
@@ -965,6 +970,14 @@ time_t portable_timegm(struct tm *tm)
     tzset();
     return ret;
 }
+#endif // End Windows not msvc
+#else // -> !Windows
+time_t portable_timegm(struct tm *tm)
+{
+    return timegm(tm);
+}
+#endif
+
 
 std::string hexprint(const std::string& in, char separ)
 {
@@ -1263,6 +1276,18 @@ bool parseHTTPRanges(const std::string& ranges, std::vector<std::pair<int64_t, i
     return true;
 }
 
+void millisleep(int millis)
+{
+#ifdef _WIN32
+    Sleep(millis);
+#else
+    struct timespec spec;
+    spec.tv_sec = millis / 1000;
+    spec.tv_nsec = (millis % 1000) * 1000000;
+    nanosleep(&spec, nullptr);
+#endif
+}
+
 // Initialization for static stuff to be called from main thread before going
 // multiple
 void smallut_init_mt()