Compile dcb.c as C++

include/maxscale/dcb.h

@@ -218,7 +218,7 @@ typedef struct dcb
     void            *authenticator_data; /**< The authenticator data for this DCB */
     DCBMM           memdata;        /**< The data related to DCB memory management */
     DCB_CALLBACK    *callbacks;     /**< The list of callbacks for the DCB */
-    long            last_read;      /*< Last time the DCB received data */
+    int64_t         last_read;      /*< Last time the DCB received data */
     struct server   *server;        /**< The associated backend server */
     SSL*            ssl;            /*< SSL struct for connection */
     bool            ssl_read_want_read;    /*< Flag */
@@ -235,13 +235,6 @@ typedef struct dcb
     skygw_chk_t     dcb_chk_tail;
 } DCB;
 
-#define DCB_INIT {.dcb_chk_top = CHK_NUM_DCB, \
-    .evq = DCBEVENTQ_INIT, .ip = {0}, .func = {0}, .authfunc = {0}, \
-    .stats = {0}, .memdata = DCBMM_INIT, \
-    .fd = DCBFD_CLOSED, .stats = DCBSTATS_INIT, .ssl_state = SSL_HANDSHAKE_UNKNOWN, \
-    .state = DCB_STATE_ALLOC, .dcb_chk_tail = CHK_NUM_DCB, \
-    .authenticator_data = NULL, .thread = {0}}
-
 /**
  * The DCB usage filer used for returning DCB's in use for a certain reason
  */

include/maxscale/hk_heartbeat.h

@@ -21,6 +21,6 @@ MXS_BEGIN_DECLS
  * every 100 milliseconds and may be used for crude timing etc.
  */
 
-extern long hkheartbeat;
+extern int64_t hkheartbeat;
 
 MXS_END_DECLS

include/maxscale/service.h

@@ -145,7 +145,7 @@ typedef struct service
     SERVICE_REFRESH_RATE rate_limit;   /**< The refresh rate limit for users table */
     MXS_FILTER_DEF **filters;          /**< Ordered list of filters */
     int n_filters;                     /**< Number of filters */
-    uint64_t conn_idle_timeout;            /**< Session timeout in seconds */
+    int64_t conn_idle_timeout;         /**< Session timeout in seconds */
     char *weightby;                    /**< Service weighting parameter name */
     struct service *next;              /**< The next service in the linked list */
     bool retry_start;                  /**< If starting of the service should be retried later */