Merge pull request #5207 from indel-ag/noulong

Fix compile error on macOS: unknown type name 'ulong'
cyrusimap · Feb 19, 2025 · c22bbf5 · c22bbf5
2 parents cf6e6c5 + 0153185
commit c22bbf5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/imap/http_client.h b/imap/http_client.h
@@ -57,7 +57,7 @@ struct body_t {
     unsigned char framing;              /* Message framing   */
     unsigned char te;                   /* Transfer-Encoding */
     unsigned max;                       /* Max allowed len   */
-    ulong len;                          /* Content-Length    */
+    unsigned long len;                  /* Content-Length    */
     struct buf payload;                 /* Payload           */
 };
 

diff --git a/imap/httpd.h b/imap/httpd.h
@@ -280,7 +280,7 @@ typedef int (*encode_proc_t)(struct transaction_t *txn,
 
 /* Meta-data for response body (payload & representation headers) */
 struct resp_body_t {
-    ulong len;                          /* Content-Length   */
+    unsigned long len;                  /* Content-Length   */
     struct range *range;                /* Content-Range    */
     struct {
         const char *fname;

diff --git a/imap/jmap_mail_submission.c b/imap/jmap_mail_submission.c
@@ -224,7 +224,7 @@ static int _emailsubmission_address_parse(json_t *addr,
             if (holduntil) {
                 if (!strcasecmp(key, "HOLDFOR")) {
                     char *endptr = (char *) val;
-                    ulong interval = val ? strtoul(val, &endptr, 10) : ULONG_MAX;
+                    unsigned long interval = val ? strtoul(val, &endptr, 10) : ULONG_MAX;
                     time_t now = time(0);
 
                     if (endptr == val || *endptr != '\0' ||