Ticket #12554: libfilezilla.patch

configure.ac

@@ -109 +109 @@
   mac=0
 fi
 
+# Check if we're on OpenBSD
+if echo $host_os | grep 'openbsd' > /dev/null 2>&1; then
+  openbsd=1
+else
+  openbsd=0
+fi
+
 # If neither, we're Unix(-like)
-if test "$mac" = "0" && test "$windows" = "0"; then
+if test "$mac" = "0" && test "$windows" = "0" && test "$openbsd" = "0"; then
   unix=1
 else
   unix=0
@@ -364 +371 @@
 
 AM_CONDITIONAL(FZ_WINDOWS, test "$windows" = "1")
 AM_CONDITIONAL(FZ_MAC, test "$mac" = "1")
+AM_CONDITIONAL(FZ_OPENBSD, test "$openbsd" = "1")
 AM_CONDITIONAL(FZ_UNIX, test "$unix" = "1")
 AM_CONDITIONAL(HAVE_CPPUNIT, [test "$have_cppunit" = "yes"])
 AM_CONDITIONAL([LOCALES_ONLY], [test "$localesonly" = "yes"])

lib/libfilezilla/libfilezilla.hpp

@@ -24 +24 @@
 /// This macro is defined if libfilezilla has been compiled for OS X.
 #define FZ_MAC
 
-/// This macro is defined if libfilezilla has been compiled Unix(-like) platforms, but excluding OS X.
+/// This macro is defined if libfilezilla has been compiled for OpenBSD.
+#define FZ_OPENBSD
+
+/// This macro is defined if libfilezilla has been compiled Unix(-like) platforms, but excluding OS X and OpenBSD
 #define FZ_UNIX
 
 

lib/libfilezilla/private/defs.hpp

@@ -12 +12 @@
 #endif
 
 // Set some mandatory defines which are used to select platform implementations
-#if !defined(FZ_WINDOWS) && !defined(FZ_MAC) && !defined(FZ_UNIX)
+#if !defined(FZ_WINDOWS) && !defined(FZ_MAC) && !defined(FZ_UNIX) && !defined(FZ_OPENBSD)
     #if defined(_WIN32) || defined(_WIN64)
         #define FZ_WINDOWS 1
     #elif defined(__APPLE__)
         #define FZ_MAC 1
+    #elif defined(__OpenBSD__)
+        #define FZ_OPENBSD 1
     #else
         #define FZ_UNIX 1
     #endif

lib/libfilezilla/string.hpp

@@ -33 +33 @@
 typedef std::wstring native_string;
 typedef std::wstring_view native_string_view;
 #endif
-#if defined(FZ_UNIX) || defined(FZ_MAC)
+#if defined(FZ_UNIX) || defined(FZ_MAC) || defined(FZ_OPENBSD)
 typedef std::string native_string;
 typedef std::string_view native_string_view;
 #endif

lib/libfilezilla/time.hpp

@@ -172 +172 @@
     bool set(SYSTEMTIME const& ft, accuracy a, zone z);
 #endif
 
-#if defined(FZ_UNIX) || defined(FZ_MAC)
+#if defined(FZ_UNIX) || defined(FZ_MAC) || defined(FZ_OPENBSD)
     /** Sets timestamp from struct tm.
      * \note Not available on Windows.
      * \warning modifies passed structure