diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /libftpconn/xinl.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'libftpconn/xinl.c')
| -rw-r--r-- | libftpconn/xinl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libftpconn/xinl.c b/libftpconn/xinl.c index a975b80d..72b7fdcf 100644 --- a/libftpconn/xinl.c +++ b/libftpconn/xinl.c @@ -19,6 +19,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define FTP_CONN_EI +#define FTP_CONN_DEFINE_EI #include <ftpconn.h> #include "priv.h" |