From 6ab98fa9f74f774ce445c827ae144d7b93ac9716 Mon Sep 17 00:00:00 2001 From: Marin Mareo Hannache Date: Sun, 1 Apr 2012 17:30:43 +0200 Subject: [PATCH] [tftp] Remove configuration option for tftm DOWNLOAD_PROTO_TFTM is now useless as tftm support has been merged into tftp.c. DOWNLOAD_PROTO_TFTP should be used instead. Signed-off-by: Michael Brown --- src/config/config.c | 3 --- src/config/general.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/config/config.c b/src/config/config.c index c96f9c53..513f054f 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -125,9 +125,6 @@ REQUIRE_OBJECT ( https ); #ifdef DOWNLOAD_PROTO_FTP REQUIRE_OBJECT ( ftp ); #endif -#ifdef DOWNLOAD_PROTO_TFTM -REQUIRE_OBJECT ( tftm ); -#endif #ifdef DOWNLOAD_PROTO_SLAM REQUIRE_OBJECT ( slam ); #endif diff --git a/src/config/general.h b/src/config/general.h index 70742165..ec095028 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -58,7 +58,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ #undef DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ #undef DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ -#undef DOWNLOAD_PROTO_TFTM /* Multicast Trivial File Transfer Protocol */ #undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */ /*