Fix compile errors
authorJeremy Harris <jgh146exb@wizmail.org>
Mon, 23 Mar 2015 21:28:25 +0000 (21:28 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Mon, 23 Mar 2015 21:29:09 +0000 (21:29 +0000)
src/src/transport.c
src/src/transports/smtp.c

index 7b3d4690808dadde3b71faa6b6777eada5dd5859..c7687369875bc486257385a6d730413e2d8ab58b 100644 (file)
@@ -1632,8 +1632,6 @@ Arguments:
 Returns:             TRUE if new_message_id set; FALSE otherwise
 */
 
 Returns:             TRUE if new_message_id set; FALSE otherwise
 */
 
-typedef struct msgq_s msgq_t;
-
 typedef struct msgq_s
 {
     uschar  message_id [MESSAGE_ID_LENGTH + 1];
 typedef struct msgq_s
 {
     uschar  message_id [MESSAGE_ID_LENGTH + 1];
index 446b3702b8a6a90b8535ff8131dc848ed7e75eba..3c983220d051ca26e795118371596f3be7c2a86b 100644 (file)
@@ -251,8 +251,8 @@ smtp_transport_options_block smtp_transport_option_defaults = {
   NULL,                       /* expand_retry_include_ip_address */
   TRUE                 /* retry_include_ip_address */
 #ifdef EXPERIMENTAL_SOCKS
   NULL,                       /* expand_retry_include_ip_address */
   TRUE                 /* retry_include_ip_address */
 #ifdef EXPERIMENTAL_SOCKS
-#endif
  ,NULL                 /* socks_proxy */
  ,NULL                 /* socks_proxy */
+#endif
 #ifdef SUPPORT_TLS
  ,NULL,                /* tls_certificate */
   NULL,                /* tls_crl */
 #ifdef SUPPORT_TLS
  ,NULL,                /* tls_certificate */
   NULL,                /* tls_crl */