Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit fe143d9a fe143d9a28ddd7cc885e8def47d07669f1cee48f by Sergey Poznyakoff
Options

Removed definitions of __P() scattered over multiple header 

files. Included <mailutils/mu_features.h> instead.
1 parent c207ab9a
Inline Side-by-side
Showing 52 changed files with 34 additions and 419 deletions
...@@ -89,14 +89,6 @@ ...@@ -89,14 +89,6 @@
89 extern "C" { 89 extern "C" {
90 #endif 90 #endif
91 91
92 #ifndef __P
93 # ifdef __STDC__
94 # define __P(args) args
95 # else
96 # define __P(args) ()
97 # endif
98 #endif /*__P */
99
100 struct imap4d_command 92 struct imap4d_command
101 { 93 {
102 const char *name; 94 const char *name;
......
...@@ -19,14 +19,7 @@ ...@@ -19,14 +19,7 @@
19 #define _MAILUTILS_ADDRESS_H 19 #define _MAILUTILS_ADDRESS_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22 #include <mailutils/mu_features.h>
23 #ifndef __P
24 # ifdef __STDC__
25 # define __P(args) args
26 # else
27 # define __P(args) ()
28 # endif
29 #endif /*__P */
30 23
31 #ifdef __cplusplus 24 #ifdef __cplusplus
32 extern "C" { 25 extern "C" {
......
...@@ -19,19 +19,12 @@ ...@@ -19,19 +19,12 @@
19 #define _MAILUTILS_ATTRIBUTE_H 19 #define _MAILUTILS_ATTRIBUTE_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 #ifdef __cplusplus 24 #ifdef __cplusplus
24 extern "C" { 25 extern "C" {
25 #endif 26 #endif
26 27
27 #ifndef __P
28 # ifdef __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*__P */
34
35 struct _attribute; 28 struct _attribute;
36 typedef struct _attribute * attribute_t; 29 typedef struct _attribute * attribute_t;
37 30
......
...@@ -19,16 +19,9 @@ ...@@ -19,16 +19,9 @@
19 #define _MAILUTILS_AUTH_H 19 #define _MAILUTILS_AUTH_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 #include <mailutils/url.h> 23 #include <mailutils/url.h>
23 24
24 #ifndef __P
25 #ifdef __STDC__
26 #define __P(args) args
27 #else
28 #define __P(args) ()
29 #endif
30 #endif /*__P */
31
32 #ifdef __cplusplus 25 #ifdef __cplusplus
33 extern "C" { 26 extern "C" {
34 #endif 27 #endif
......
...@@ -19,16 +19,9 @@ ...@@ -19,16 +19,9 @@
19 #define _MAILUTILS_BODY_H 19 #define _MAILUTILS_BODY_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 #include <mailutils/stream.h> 23 #include <mailutils/stream.h>
23 24
24 #ifndef __P
25 # ifdef __STDC__
26 # define __P(args) args
27 # else
28 # define __P(args) ()
29 # endif
30 #endif /* __P */
31
32 #ifdef __cplusplus 25 #ifdef __cplusplus
33 extern "C" { 26 extern "C" {
34 #endif 27 #endif
......
...@@ -20,14 +20,7 @@ ...@@ -20,14 +20,7 @@
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <stdarg.h> 22 #include <stdarg.h>
23 23 #include <mailutils/mu_features.h>
24 #ifndef __P
25 #ifdef __STDC__
26 #define __P(args) args
27 #else
28 #define __P(args) ()
29 #endif
30 #endif /*__P */
31 24
32 #ifdef __cplusplus 25 #ifdef __cplusplus
33 extern "C" { 26 extern "C" {
......
...@@ -19,19 +19,12 @@ ...@@ -19,19 +19,12 @@
19 # define _MAILUTILS_ENVELOPE_H 19 # define _MAILUTILS_ENVELOPE_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 #ifdef __cplusplus 24 #ifdef __cplusplus
24 extern "C" { /*}*/ 25 extern "C" { /*}*/
25 #endif 26 #endif
26 27
27 #ifndef __P
28 # ifdef __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*__P */
34
35 struct _envelope; 28 struct _envelope;
36 typedef struct _envelope *envelope_t; 29 typedef struct _envelope *envelope_t;
37 30
......
...@@ -19,19 +19,13 @@ ...@@ -19,19 +19,13 @@
19 #define _MAILUTILS_ERRNO_H 1 19 #define _MAILUTILS_ERRNO_H 1
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <errno.h>
23 #include <mailutils/mu_features.h>
22 24
23 #ifdef __cplusplus 25 #ifdef __cplusplus
24 extern "C" { 26 extern "C" {
25 #endif 27 #endif
26 28
27 #ifndef __P
28 # if __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*!__P */
34
35 #define MU_ERR_BASE 0x1000 29 #define MU_ERR_BASE 0x1000
36 30
37 #define MU_ERR_NO_HANDLER (MU_ERR_BASE | 0x001) 31 #define MU_ERR_NO_HANDLER (MU_ERR_BASE | 0x001)
......
...@@ -19,14 +19,7 @@ ...@@ -19,14 +19,7 @@
19 #define _MAILUTILS_ERROR_H 19 #define _MAILUTILS_ERROR_H
20 20
21 #include <stdarg.h> 21 #include <stdarg.h>
22 22 #include <mailutils/mu_features.h>
23 #ifndef __P
24 #ifdef __STDC__
25 #define __P(args) args
26 #else
27 #define __P(args) ()
28 #endif
29 #endif /*__P */
30 23
31 #ifdef __cplusplus 24 #ifdef __cplusplus
32 extern "C" { 25 extern "C" {
......
...@@ -23,18 +23,11 @@ ...@@ -23,18 +23,11 @@
23 #define _MAILUTILS_FILTER_H 23 #define _MAILUTILS_FILTER_H
24 24
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <mailutils/mu_features.h>
26 #include <mailutils/list.h> 27 #include <mailutils/list.h>
27 #include <mailutils/property.h> 28 #include <mailutils/property.h>
28 #include <mailutils/stream.h> 29 #include <mailutils/stream.h>
29 30
30 #ifndef __P
31 # ifdef __STDC__
32 # define __P(args) args
33 # else
34 # define __P(args) ()
35 # endif
36 #endif /*__P */
37
38 #ifdef __cplusplus 31 #ifdef __cplusplus
39 extern "C" { 32 extern "C" {
40 #endif 33 #endif
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22
23 #include <mailutils/mu_features.h>
23 #include <mailutils/url.h> 24 #include <mailutils/url.h>
24 #include <mailutils/observer.h> 25 #include <mailutils/observer.h>
25 #include <mailutils/debug.h> 26 #include <mailutils/debug.h>
...@@ -32,14 +33,6 @@ ...@@ -32,14 +33,6 @@
32 extern "C" { 33 extern "C" {
33 #endif 34 #endif
34 35
35 #ifndef __P
36 # ifdef __STDC__
37 # define __P(args) args
38 # else
39 # define __P(args) ()
40 # endif
41 #endif /*__P */
42
43 /* Forward declaration. */ 36 /* Forward declaration. */
44 struct _folder; 37 struct _folder;
45 typedef struct _folder *folder_t; 38 typedef struct _folder *folder_t;
......
...@@ -19,16 +19,9 @@ ...@@ -19,16 +19,9 @@
19 #define _MAILUTILS_HEADER_H 19 #define _MAILUTILS_HEADER_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 #include <mailutils/stream.h> 23 #include <mailutils/stream.h>
23 24
24 #ifndef __P
25 #ifdef __STDC__
26 #define __P(args) args
27 #else
28 #define __P(args) ()
29 #endif
30 #endif /*__P */
31
32 #ifdef __cplusplus 25 #ifdef __cplusplus
33 extern "C" { 26 extern "C" {
34 #endif 27 #endif
......
...@@ -18,17 +18,10 @@ ...@@ -18,17 +18,10 @@
18 #ifndef _MAILUTILS_ITERATOR_H 18 #ifndef _MAILUTILS_ITERATOR_H
19 #define _MAILUTILS_ITERATOR_H 19 #define _MAILUTILS_ITERATOR_H
20 20
21 #include <mailutils/mu_features.h>
21 #include <mailutils/list.h> 22 #include <mailutils/list.h>
22 #include <sys/types.h> 23 #include <sys/types.h>
23 24
24 #ifndef __P
25 #ifdef __STDC__
26 #define __P(args) args
27 #else
28 #define __P(args) ()
29 #endif
30 #endif /*__P */
31
32 #ifdef __cplusplus 25 #ifdef __cplusplus
33 extern "C" { 26 extern "C" {
34 #endif 27 #endif
......
...@@ -18,16 +18,9 @@ ...@@ -18,16 +18,9 @@
18 #ifndef _MAILUTILS_LIST_H 18 #ifndef _MAILUTILS_LIST_H
19 #define _MAILUTILS_LIST_H 19 #define _MAILUTILS_LIST_H
20 20
21 #include <mailutils/mu_features.h>
21 #include <sys/types.h> 22 #include <sys/types.h>
22 23
23 #ifndef __P
24 # ifdef __STDC__
25 # define __P(args) args
26 # else
27 # define __P(args) ()
28 # endif
29 #endif /*__P */
30
31 #ifdef __cplusplus 24 #ifdef __cplusplus
32 extern "C" { 25 extern "C" {
33 #endif 26 #endif
......
...@@ -18,20 +18,13 @@ ...@@ -18,20 +18,13 @@
18 #ifndef _MAILUTILS_LOCKER_H 18 #ifndef _MAILUTILS_LOCKER_H
19 #define _MAILUTILS_LOCKER_H 19 #define _MAILUTILS_LOCKER_H
20 20
21 #include <mailutils/mu_features.h>
21 #include <sys/types.h> 22 #include <sys/types.h>
22 23
23 #ifdef __cplusplus 24 #ifdef __cplusplus
24 extern "C" { 25 extern "C" {
25 #endif 26 #endif
26 27
27 #ifndef __P
28 # ifdef __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*__P */
34
35 struct _locker; 28 struct _locker;
36 typedef struct _locker *locker_t; 29 typedef struct _locker *locker_t;
37 30
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 #define _MAILUTILS_MAILBOX_H 19 #define _MAILUTILS_MAILBOX_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 /* Forward declaration. */ 24 /* Forward declaration. */
24 struct _mailbox; 25 struct _mailbox;
...@@ -37,13 +38,7 @@ typedef struct _mailbox *mailbox_t; ...@@ -37,13 +38,7 @@ typedef struct _mailbox *mailbox_t;
37 extern "C" { 38 extern "C" {
38 #endif 39 #endif
39 40
40 #ifndef __P 41 extern char *mu_path_maildir;
41 # ifdef __STDC__
42 # define __P(args) args
43 # else
44 # define __P(args) ()
45 # endif
46 #endif /*__P */
47 42
48 /* Constructor/destructor and possible types. */ 43 /* Constructor/destructor and possible types. */
49 extern int mailbox_create __P ((mailbox_t *, const char *)); 44 extern int mailbox_create __P ((mailbox_t *, const char *));
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22
23 #include <mailutils/mu_features.h>
23 #include <mailutils/address.h> 24 #include <mailutils/address.h>
24 #include <mailutils/debug.h> 25 #include <mailutils/debug.h>
25 #include <mailutils/message.h> 26 #include <mailutils/message.h>
...@@ -28,14 +29,6 @@ ...@@ -28,14 +29,6 @@
28 #include <mailutils/stream.h> 29 #include <mailutils/stream.h>
29 #include <mailutils/url.h> 30 #include <mailutils/url.h>
30 31
31 #ifndef __P
32 # ifdef __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /* __P */
38
39 #ifdef __cplusplus 32 #ifdef __cplusplus
40 extern "C" { 33 extern "C" {
41 #endif 34 #endif
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 #define _MAILUTILS_MESSAGE_H 19 #define _MAILUTILS_MESSAGE_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 /* forward declaration */ 24 /* forward declaration */
24 struct _message; 25 struct _message;
...@@ -33,14 +34,6 @@ typedef struct _message *message_t; ...@@ -33,14 +34,6 @@ typedef struct _message *message_t;
33 #include <mailutils/observer.h> 34 #include <mailutils/observer.h>
34 #include <mailutils/stream.h> 35 #include <mailutils/stream.h>
35 36
36 #ifndef __P
37 # ifdef __STDC__
38 # define __P(args) args
39 # else
40 # define __P(args) ()
41 # endif
42 #endif /* __P */
43
44 #ifdef __cplusplus 37 #ifdef __cplusplus
45 extern "C" { 38 extern "C" {
46 #endif 39 #endif
......
...@@ -19,17 +19,10 @@ ...@@ -19,17 +19,10 @@
19 #define _MAILUTILS_MIME_H 19 #define _MAILUTILS_MIME_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 #include <mailutils/header.h> 23 #include <mailutils/header.h>
23 #include <mailutils/stream.h> 24 #include <mailutils/stream.h>
24 25
25 #ifndef __P
26 # ifdef __STDC__
27 # define __P(args) args
28 # else
29 # define __P(args) ()
30 # endif
31 #endif /* __P */
32
33 /* mime flags */ 26 /* mime flags */
34 #define MIME_INCREAMENTAL_PARSER 0x1 27 #define MIME_INCREAMENTAL_PARSER 0x1
35 28
......
...@@ -19,19 +19,12 @@ ...@@ -19,19 +19,12 @@
19 #define _MAILUTILS_MONITOR_H 19 #define _MAILUTILS_MONITOR_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 #ifdef __cplusplus 24 #ifdef __cplusplus
24 extern "C" { 25 extern "C" {
25 #endif 26 #endif
26 27
27 #ifndef __P
28 # ifdef __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*__P */
34
35 struct _monitor 28 struct _monitor
36 { 29 {
37 void *data; 30 void *data;
......
...@@ -24,14 +24,7 @@ ...@@ -24,14 +24,7 @@
24 */ 24 */
25 25
26 #include <time.h> 26 #include <time.h>
27 27 #include <mailutils/mu_features.h>
28 #ifndef __P
29 # ifdef __STDC__
30 # define __P(args) args
31 # else
32 # define __P(args) ()
33 # endif
34 #endif /*__P */
35 28
36 #ifdef __cplusplus 29 #ifdef __cplusplus
37 extern "C" { 30 extern "C" {
...@@ -80,6 +73,9 @@ extern char * mu_normalize_path __P((char *path, const char *delim)); ...@@ -80,6 +73,9 @@ extern char * mu_normalize_path __P((char *path, const char *delim));
80 extern char * mu_normalize_maildir __P((const char *dir)); 73 extern char * mu_normalize_maildir __P((const char *dir));
81 extern int mu_tempfile __P((const char *tmpdir, char **namep)); 74 extern int mu_tempfile __P((const char *tmpdir, char **namep));
82 75
76 extern char * mu_get_full_path __P((const char *file));
77 extern char * mu_getcwd __P((void));
78
83 #ifdef __cplusplus 79 #ifdef __cplusplus
84 } 80 }
85 #endif 81 #endif
......
...@@ -19,14 +19,7 @@ ...@@ -19,14 +19,7 @@
19 #define _MAILUTILS_OBSERVER_H 19 #define _MAILUTILS_OBSERVER_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22 #include <mailutils/mu_features.h>
23 #ifndef __P
24 #ifdef __STDC__
25 #define __P(args) args
26 #else
27 #define __P(args) ()
28 #endif
29 #endif /*__P */
30 23
31 #ifdef __cplusplus 24 #ifdef __cplusplus
32 extern "C" { 25 extern "C" {
......
...@@ -22,17 +22,10 @@ ...@@ -22,17 +22,10 @@
22 #ifndef _MAILUTILS_PARSE822_H 22 #ifndef _MAILUTILS_PARSE822_H
23 #define _MAILUTILS_PARSE822_H 23 #define _MAILUTILS_PARSE822_H
24 24
25 #include <mailutils/mu_features.h>
25 #include <mailutils/address.h> 26 #include <mailutils/address.h>
26 #include <mailutils/mutil.h> 27 #include <mailutils/mutil.h>
27 28
28 #ifndef __P
29 # ifdef __STDC__
30 # define __P(args) args
31 # else
32 # define __P(args) ()
33 # endif
34 #endif /*__P */
35
36 #ifdef __cplusplus 29 #ifdef __cplusplus
37 extern "C" { 30 extern "C" {
38 #endif 31 #endif
......
...@@ -19,14 +19,7 @@ ...@@ -19,14 +19,7 @@
19 #define _MAILUTILS_PROPERTY_H 19 #define _MAILUTILS_PROPERTY_H
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22 #include <mailutils/mu_features.h>
23 #ifndef __P
24 # ifdef __STDC__
25 # define __P(args) args
26 # else
27 # define __P(args) ()
28 # endif
29 #endif /*__P */
30 23
31 #ifdef __cplusplus 24 #ifdef __cplusplus
32 extern "C" { 25 extern "C" {
......
...@@ -20,20 +20,13 @@ ...@@ -20,20 +20,13 @@
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 22
23 #include <mailutils/mu_features.h>
23 #include <mailutils/url.h> 24 #include <mailutils/url.h>
24 #include <mailutils/mailbox.h> 25 #include <mailutils/mailbox.h>
25 #include <mailutils/mailer.h> 26 #include <mailutils/mailer.h>
26 #include <mailutils/folder.h> 27 #include <mailutils/folder.h>
27 #include <mailutils/list.h> 28 #include <mailutils/list.h>
28 29
29 #ifndef __P
30 # ifdef __STDC__
31 # define __P(args) args
32 # else
33 # define __P(args) ()
34 # endif
35 #endif /*__P */
36
37 #ifdef __cplusplus 30 #ifdef __cplusplus
38 extern "C" { 31 extern "C" {
39 #endif 32 #endif
......
...@@ -21,20 +21,13 @@ ...@@ -21,20 +21,13 @@
21 #include <stdio.h> 21 #include <stdio.h>
22 #include <sys/types.h> 22 #include <sys/types.h>
23 23
24 #include <mailutils/mu_features.h>
24 #include <mailutils/property.h> 25 #include <mailutils/property.h>
25 26
26 #ifdef __cplusplus 27 #ifdef __cplusplus
27 extern "C" { /*}*/ 28 extern "C" { /*}*/
28 #endif 29 #endif
29 30
30 #ifndef __P
31 # ifdef __STDC__
32 # define __P(args) args
33 # else
34 # define __P(args) ()
35 # endif
36 #endif /*__P */
37
38 struct _stream; 31 struct _stream;
39 typedef struct _stream *stream_t; 32 typedef struct _stream *stream_t;
40 33
......
...@@ -19,19 +19,12 @@ ...@@ -19,19 +19,12 @@
19 #define _MAILUTILS_URL_H 1 19 #define _MAILUTILS_URL_H 1
20 20
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <mailutils/mu_features.h>
22 23
23 #ifdef __cplusplus 24 #ifdef __cplusplus
24 extern "C" { 25 extern "C" {
25 #endif 26 #endif
26 27
27 #ifndef __P
28 # if __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*!__P */
34
35 /* forward declaration */ 28 /* forward declaration */
36 struct _url; 29 struct _url;
37 typedef struct _url * url_t; 30 typedef struct _url * url_t;
......
...@@ -71,14 +71,6 @@ ...@@ -71,14 +71,6 @@
71 extern "C" { 71 extern "C" {
72 #endif 72 #endif
73 73
74 #ifndef __P
75 # ifdef __STDC__
76 # define __P(args) args
77 # else
78 # define __P(args) ()
79 # endif
80 #endif /*__P */
81
82 /* Type definitions */ 74 /* Type definitions */
83 #ifndef function_t 75 #ifndef function_t
84 typedef int function_t __P ((int, char **)); 76 typedef int function_t __P ((int, char **));
......
...@@ -24,14 +24,6 @@ ...@@ -24,14 +24,6 @@
24 24
25 #include <mailutils/address.h> 25 #include <mailutils/address.h>
26 26
27 #ifndef __P
28 # ifdef __STDC__
29 # define __P(args) args
30 # else
31 # define __P(args) ()
32 # endif
33 #endif /*__P */
34
35 #ifdef __cplusplus 27 #ifdef __cplusplus
36 extern "C" { 28 extern "C" {
37 #endif 29 #endif
......
...@@ -28,14 +28,6 @@ ...@@ -28,14 +28,6 @@
28 extern "C" { 28 extern "C" {
29 #endif 29 #endif
30 30
31 #ifndef __P
32 # ifdef __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /*__P */
38
39 struct _attribute 31 struct _attribute
40 { 32 {
41 void *owner; 33 void *owner;
......
...@@ -25,14 +25,6 @@ ...@@ -25,14 +25,6 @@
25 #include <mailutils/auth.h> 25 #include <mailutils/auth.h>
26 #include <sys/types.h> 26 #include <sys/types.h>
27 27
28 #ifndef __P
29 #ifdef __STDC__
30 #define __P(args) args
31 #else
32 #define __P(args) ()
33 #endif
34 #endif /*__P */
35
36 #ifdef __cplusplus 28 #ifdef __cplusplus
37 extern "C" { 29 extern "C" {
38 #endif 30 #endif
......
...@@ -28,14 +28,6 @@ ...@@ -28,14 +28,6 @@
28 #include <stdio.h> 28 #include <stdio.h>
29 #include <sys/types.h> 29 #include <sys/types.h>
30 30
31 #ifndef __P
32 # ifdef __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /* __P */
38
39 #ifdef __cplusplus 31 #ifdef __cplusplus
40 extern "C" { 32 extern "C" {
41 #endif 33 #endif
......
...@@ -22,14 +22,6 @@ ...@@ -22,14 +22,6 @@
22 # include <dmalloc.h> 22 # include <dmalloc.h>
23 #endif 23 #endif
24 24
25 #ifndef __P
26 #ifdef __STDC__
27 #define __P(args) args
28 #else
29 #define __P(args) ()
30 #endif
31 #endif /*__P */
32
33 #include <mailutils/debug.h> 25 #include <mailutils/debug.h>
34 26
35 #ifdef __cplusplus 27 #ifdef __cplusplus
......
...@@ -28,14 +28,6 @@ ...@@ -28,14 +28,6 @@
28 extern "C" { 28 extern "C" {
29 #endif 29 #endif
30 30
31 #ifndef __P
32 # ifdef __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /*__P */
38
39 struct _envelope 31 struct _envelope
40 { 32 {
41 void *owner; 33 void *owner;
......
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
27 #include <mailutils/monitor.h> 27 #include <mailutils/monitor.h>
28 #include <mailutils/property.h> 28 #include <mailutils/property.h>
29 29
30 #ifndef __P
31 # ifdef __STDC__
32 # define __P(args) args
33 # else
34 # define __P(args) ()
35 # endif
36 #endif /*__P */
37
38 #ifdef __cplusplus 30 #ifdef __cplusplus
39 extern "C" { 31 extern "C" {
40 #endif 32 #endif
......
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
32 extern "C" { 32 extern "C" {
33 #endif 33 #endif
34 34
35 #ifndef __P
36 # ifdef __STDC__
37 # define __P(args) args
38 # else
39 # define __P(args) ()
40 # endif
41 #endif /*__P */
42
43 struct _folder 35 struct _folder
44 { 36 {
45 /* Data */ 37 /* Data */
......
...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 #ifndef __P
33 # ifdef __STDC__
34 # define __P(args) args
35 # else
36 # define __P(args) ()
37 # endif
38 #endif /*__P */
39
40 /* The structure members are offset that point to the begin/end of header 32 /* The structure members are offset that point to the begin/end of header
41 fields. */ 33 fields. */
42 struct _hdr 34 struct _hdr
......
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
31 extern "C" { 31 extern "C" {
32 #endif 32 #endif
33 33
34 #ifndef __P
35 # ifdef __STDC__
36 # define __P(args) args
37 # else
38 # define __P(args) ()
39 # endif
40 #endif /*__P */
41
42 #define CLEAR_STATE(f_imap) \ 34 #define CLEAR_STATE(f_imap) \
43 f_imap->selected = NULL, f_imap->state = IMAP_NO_STATE 35 f_imap->selected = NULL, f_imap->state = IMAP_NO_STATE
44 36
......
...@@ -24,14 +24,6 @@ ...@@ -24,14 +24,6 @@
24 24
25 #include <mailutils/iterator.h> 25 #include <mailutils/iterator.h>
26 26
27 #ifndef __P
28 #ifdef __STDC__
29 #define __P(args) args
30 #else
31 #define __P(args) ()
32 #endif
33 #endif /*__P */
34
35 #ifdef __cplusplus 27 #ifdef __cplusplus
36 extern "C" { 28 extern "C" {
37 #endif 29 #endif
......
...@@ -27,15 +27,6 @@ ...@@ -27,15 +27,6 @@
27 #include <mailutils/list.h> 27 #include <mailutils/list.h>
28 #include <mailutils/monitor.h> 28 #include <mailutils/monitor.h>
29 29
30
31 #ifndef __P
32 #ifdef __STDC__
33 #define __P(args) args
34 #else
35 #define __P(args) ()
36 #endif
37 #endif /*__P */
38
39 #ifdef __cplusplus 30 #ifdef __cplusplus
40 extern "C" { 31 extern "C" {
41 #endif 32 #endif
......
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
32 extern "C" { 32 extern "C" {
33 #endif 33 #endif
34 34
35 #ifndef __P
36 # ifdef __STDC__
37 # define __P(args) args
38 # else
39 # define __P(args) ()
40 # endif
41 #endif /*__P */
42
43 struct _mailbox 35 struct _mailbox
44 { 36 {
45 /* Data */ 37 /* Data */
......
...@@ -30,20 +30,12 @@ ...@@ -30,20 +30,12 @@
30 extern "C" { 30 extern "C" {
31 #endif 31 #endif
32 32
33 #ifndef __P 33 /* mailer states */
34 # ifdef __STDC__
35 # define __P(args) args
36 # else
37 # define __P(args) ()
38 # endif
39 #endif /*__P */
40
41 // mailer states
42 #define MAILER_STATE_HDR 1 34 #define MAILER_STATE_HDR 1
43 #define MAILER_STATE_MSG 2 35 #define MAILER_STATE_MSG 2
44 #define MAILER_STATE_COMPLETE 3 36 #define MAILER_STATE_COMPLETE 3
45 37
46 // mailer messages 38 /* mailer messages */
47 #define MAILER_HELO 1 39 #define MAILER_HELO 1
48 #define MAILER_MAIL 2 40 #define MAILER_MAIL 2
49 #define MAILER_RCPT 3 41 #define MAILER_RCPT 3
......
...@@ -33,14 +33,6 @@ ...@@ -33,14 +33,6 @@
33 extern "C" { 33 extern "C" {
34 #endif 34 #endif
35 35
36 #ifndef __P
37 # ifdef __STDC__
38 # define __P(args) args
39 # else
40 # define __P(args) ()
41 # endif
42 #endif /*__P */
43
44 struct _message 36 struct _message
45 { 37 {
46 /* Who is the owner. */ 38 /* Who is the owner. */
......
...@@ -25,14 +25,6 @@ ...@@ -25,14 +25,6 @@
25 #include <sys/types.h> 25 #include <sys/types.h>
26 #include <mailutils/mime.h> 26 #include <mailutils/mime.h>
27 27
28 #ifndef __P
29 #ifdef __STDC__
30 #define __P(args) args
31 #else
32 #define __P(args) ()
33 #endif
34 #endif /*__P */
35
36 #ifdef __cplusplus 28 #ifdef __cplusplus
37 extern "C" { 29 extern "C" {
38 #endif 30 #endif
......
...@@ -32,15 +32,7 @@ ...@@ -32,15 +32,7 @@
32 #ifdef __cplusplus 32 #ifdef __cplusplus
33 extern "C" { 33 extern "C" {
34 #endif 34 #endif
35 35 /* FIXME: any protos? */
36 #ifndef __P
37 # if __STDC__
38 # define __P(x) x
39 # else
40 # define __P(x)
41 # endif
42 #endif
43
44 #ifdef __cplusplus 36 #ifdef __cplusplus
45 } 37 }
46 #endif 38 #endif
......
...@@ -24,14 +24,6 @@ ...@@ -24,14 +24,6 @@
24 24
25 #include <mailutils/observer.h> 25 #include <mailutils/observer.h>
26 26
27 #ifndef __P
28 #ifdef __STDC__
29 #define __P(args) args
30 #else
31 #define __P(args) ()
32 #endif
33 #endif /*__P */
34
35 #ifdef __cplusplus 27 #ifdef __cplusplus
36 extern "C" { 28 extern "C" {
37 #endif 29 #endif
......
...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
29 #include <mailutils/property.h> 29 #include <mailutils/property.h>
30 #include <mailutils/monitor.h> 30 #include <mailutils/monitor.h>
31 31
32 #ifndef __P
33 #ifdef __STDC__
34 #define __P(args) args
35 #else
36 #define __P(args) ()
37 #endif
38 #endif /*__P */
39
40 #ifdef __cplusplus 32 #ifdef __cplusplus
41 extern "C" { 33 extern "C" {
42 #endif 34 #endif
......
...@@ -28,14 +28,6 @@ ...@@ -28,14 +28,6 @@
28 extern "C" { 28 extern "C" {
29 #endif 29 #endif
30 30
31 #ifndef __P
32 # ifdef __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /*__P */
38
39 /* The pop and imap defines are all wrong now, since they seem intertwined 31 /* The pop and imap defines are all wrong now, since they seem intertwined
40 with the old url parsing code. Also, "pop://" is not the POP scheme, 32 with the old url parsing code. Also, "pop://" is not the POP scheme,
41 at least not as a scheme is described in the RFCs. 33 at least not as a scheme is described in the RFCs.
......
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
27 extern "C" { 27 extern "C" {
28 #endif 28 #endif
29 29
30 #ifndef __P
31 # ifdef __STDC__
32 # define __P(args) args
33 # else
34 # define __P(args) ()
35 # endif
36 #endif /*__P */
37
38 /* Read buffer */ 30 /* Read buffer */
39 struct rbuffer 31 struct rbuffer
40 { 32 {
......
...@@ -28,14 +28,6 @@ ...@@ -28,14 +28,6 @@
28 extern "C" { 28 extern "C" {
29 #endif 29 #endif
30 30
31 #ifndef __P
32 # if __STDC__
33 # define __P(args) args
34 # else
35 # define __P(args) ()
36 # endif
37 #endif /*!__P */
38
39 struct _url 31 struct _url
40 { 32 {
41 /* Data */ 33 /* Data */
......
...@@ -162,14 +162,6 @@ ...@@ -162,14 +162,6 @@
162 #define ERR_UNKNOWN 15 162 #define ERR_UNKNOWN 15
163 #define ERR_MBOX_SYNC 16 163 #define ERR_MBOX_SYNC 16
164 164
165 #ifndef __P
166 # ifdef __STDC__
167 # define __P(args) args
168 # else
169 # define __P(args) ()
170 # endif
171 #endif /* __P */
172
173 extern mailbox_t mbox; 165 extern mailbox_t mbox;
174 extern int state; 166 extern int state;
175 extern char *username; 167 extern char *username;
......
...@@ -35,13 +35,5 @@ ...@@ -35,13 +35,5 @@
35 #include <mailutils/filter.h> 35 #include <mailutils/filter.h>
36 #include <mailutils/registrar.h> 36 #include <mailutils/registrar.h>
37 37
38 #ifndef __P
39 #ifdef __STDC__
40 #define __P(args) args
41 #else
42 #define __P(args) ()
43 #endif
44 #endif /*__P */
45
46 int msglist __P ((mailbox_t mbox, int show_all, int argc, char **argv, int **set, int *n)); 38 int msglist __P ((mailbox_t mbox, int show_all, int argc, char **argv, int **set, int *n));
47 #endif 39 #endif
......