diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-11-14 23:42:07 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-11-14 23:42:07 +0000 |
| commit | ebb95b68792dde490a1ea1042209525f176af58d (patch) | |
| tree | 2a980be2b7bea3db77dec209e6ca5f591165885b /conf.h | |
| parent | a6df0b5d21370549328c7929a008abb68f2ed4db (diff) | |
| parent | 1bf1ae6f25ff56894d67999791802aa864eaa02b (diff) | |
Merging from devel/Jelmer.
Diffstat (limited to 'conf.h')
| -rw-r--r-- | conf.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -32,7 +32,7 @@ typedef enum authmode { AUTHMODE_OPEN, AUTHMODE_CLOSED, AUTHMODE_REGISTERED } au typedef struct conf { char *iface; - signed int port; + char *port; int nofork; int verbose; runmode_t runmode; @@ -50,7 +50,7 @@ typedef struct conf int ping_timeout; } conf_t; -conf_t *conf_load( int argc, char *argv[] ); +G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] ); void conf_loaddefaults( irc_t *irc ); #endif |