Ticket #5776: libs_libmythdb-krazy2-typedefs.patch

mythtv/libs/libmythdb/compat.h

@@ -269 +269 @@
 
 #include "mythconfig.h"
 #if defined(CONFIG_DARWIN) && ! defined (_SUSECONDS_T)
-    typedef int32_t suseconds_t;   // 10.3 or earlier don't have this
+    typedef qint32 suseconds_t;   // 10.3 or earlier don't have this
 #endif
 
 // Libdvdnav now uses off64_t lseek64(), which Darwin doesn't have.

mythtv/libs/libmythdb/msocketdevice_win.cpp

@@ -46 +46 @@
 #include "qdatetime.h"
 
 #include <qcoreapplication.h>
+#include <QtGlobal>
 
 #include <string.h>
 
@@ -80 +81 @@
 // Only the new version is the correct one, so always
 // use this structure.
 struct qt_in6_addr {
-    u_char qt_s6_addr[16];
+    uchar qt_s6_addr[16];
 };
 typedef struct {
     short   sin6_family;            /* AF_INET6 */
-    u_short sin6_port;              /* Transport level port number */
-    u_long  sin6_flowinfo;          /* IPv6 flow information */
+    ushort sin6_port;              /* Transport level port number */
+    ulong  sin6_flowinfo;          /* IPv6 flow information */
     struct  qt_in6_addr sin6_addr;  /* IPv6 address */
-    u_long  sin6_scope_id;          /* set of interfaces for a scope */
+    ulong  sin6_scope_id;          /* set of interfaces for a scope */
 } qt_sockaddr_in6;
 #endif
 
@@ -639 +640 @@
 {
     if ( !isValid() )
         return -1;
-    u_long nbytes = 0;
+    ulong nbytes = 0;
     if ( ::ioctlsocket(fd, FIONREAD, &nbytes) < 0 )
         return -1;