Changeset 85d7b85 for conf.h

Timestamp:

2008-04-02T14:22:57Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk.

File:

• conf.h (modified) (2 diffs)

conf.h

@@ -33 +33 @@
 {
         char *iface;
-        signed int port;
+        char *port;
         int nofork;
         int verbose;
@@ -49 +49 @@
         int ping_interval;
         int ping_timeout;
+        char *user;
 } 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 );