diff options
Diffstat (limited to 'libftpconn')
| -rw-r--r-- | libftpconn/ftpconn.h | 11 | ||||
| -rw-r--r-- | libftpconn/priv.h | 12 | ||||
| -rw-r--r-- | libftpconn/xinl.c | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/libftpconn/ftpconn.h b/libftpconn/ftpconn.h index 558ff8f9..6bff5918 100644 --- a/libftpconn/ftpconn.h +++ b/libftpconn/ftpconn.h @@ -26,6 +26,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> +#include <features.h> #define __need_error_t #include <errno.h> @@ -35,8 +36,10 @@ typedef int error_t; #define __error_t_defined #endif -#ifndef FTP_CONN_EI -# define FTP_CONN_EI extern inline +#ifdef FTP_CONN_DEFINE_EI +#define FTP_CONN_EI +#else +#define FTP_CONN_EI __extern_inline #endif struct ftp_conn; @@ -242,6 +245,9 @@ error_t ftp_conn_open (struct ftp_conn *conn); void ftp_conn_close (struct ftp_conn *conn); +extern error_t ftp_conn_validate_syshooks (struct ftp_conn *conn); + +#if defined(__USE_EXTERN_INLINES) || defined(FTP_CONN_DEFINE_EI) /* Makes sure that CONN's syshooks are set according to the remote system type. */ FTP_CONN_EI error_t @@ -253,6 +259,7 @@ ftp_conn_validate_syshooks (struct ftp_conn *conn) /* Opening the connection should set the syshooks. */ return ftp_conn_open (conn); } +#endif /* Use extern inlines. */ /* Create a new ftp connection as specified by PARAMS, and return it in CONN; HOOKS contains customization hooks used by the connection. Neither PARAMS diff --git a/libftpconn/priv.h b/libftpconn/priv.h index fb4dae50..570ea290 100644 --- a/libftpconn/priv.h +++ b/libftpconn/priv.h @@ -21,8 +21,12 @@ #ifndef __FTPCONN_PRIV_H__ #define __FTPCONN_PRIV_H__ -#ifndef FTP_CONN_EI -# define FTP_CONN_EI extern inline +#include <features.h> + +#ifdef FTP_CONN_DEFINE_EI +#define FTP_CONN_EI +#else +#define FTP_CONN_EI __extern_inline #endif /* Ftp reply codes. */ @@ -61,6 +65,9 @@ #define REPLY_IS_TRANSIENT(rep) ((rep) >= 400 && (rep) < 500) #define REPLY_IS_FAILURE(rep) ((rep) >= 500 && (rep) < 600) +extern error_t unexpected_reply (struct ftp_conn *conn, int reply, const char *reply_txt, + const error_t *poss_errs); +#if defined(__USE_EXTERN_INLINES) || defined(FTP_CONN_DEFINE_EI) FTP_CONN_EI error_t unexpected_reply (struct ftp_conn *conn, int reply, const char *reply_txt, const error_t *poss_errs) @@ -79,6 +86,7 @@ unexpected_reply (struct ftp_conn *conn, int reply, const char *reply_txt, else return EGRATUITOUS; } +#endif /* Use extern inlines. */ /* Error codes we think may result from file operations we do. */ extern const error_t ftp_conn_poss_file_errs[]; 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" |