Changeset ebb95b6 for conf.h

Timestamp:

2007-11-14T23:42:07Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

50e1776

Parents:

a6df0b5 (diff), 1bf1ae6 (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:

Merging from devel/Jelmer.

File:

• conf.h (modified) (2 diffs)

conf.h

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