зеркало из https://github.com/github/putty.git
Get rid of #ifdef DEFINE_PLUG_METHOD_MACROS.
I don't actually know why this was ever here; it appeared in the very
first commit that invented Plug in the first place (7b0e08270
) without
explanation. Perhaps Dave's original idea was that sometimes you'd
need those macros _not_ to be defined so that the same names could be
reused as the methods for a particular Plug instance? But I don't
think that ever actually happened, and the code base builds just fine
with those macros defined unconditionally just like all the other sets
of method macros we now have, so let's get rid of this piece of cruft
that was apparently unnecessary all along.
This commit is contained in:
Родитель
884a7df94b
Коммит
ed652a70e8
|
@ -5,7 +5,6 @@
|
|||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
||||
|
|
1
cproxy.c
1
cproxy.c
|
@ -9,7 +9,6 @@
|
|||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "putty.h"
|
||||
#include "ssh.h" /* For MD5 support */
|
||||
#include "network.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -156,7 +156,6 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
|
|||
#define sk_write_eof(s) (((s)->vt->write_eof) (s))
|
||||
#define sk_flush(s) (((s)->vt->flush) (s))
|
||||
|
||||
#ifdef DEFINE_PLUG_METHOD_MACROS
|
||||
#define plug_log(p,type,addr,port,msg,code) \
|
||||
(((p)->vt->log) (p, type, addr, port, msg, code))
|
||||
#define plug_closing(p,msg,code,callback) \
|
||||
|
@ -167,7 +166,6 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
|
|||
(((p)->vt->sent) (p, bufsize))
|
||||
#define plug_accepting(p, constructor, ctx) \
|
||||
(((p)->vt->accepting)(p, constructor, ctx))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Special error values are returned from sk_namelookup and sk_new
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
#include "proxy.h"
|
||||
|
|
1
proxy.c
1
proxy.c
|
@ -9,7 +9,6 @@
|
|||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
#include "proxy.h"
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
#include "tree234.h"
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#define NEED_DECLARATION_OF_SELECT /* in order to initialise it */
|
||||
|
||||
#include "putty.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
#if !defined NO_SECURITY
|
||||
|
||||
#define DEFINE_PLUG_METHOD_MACROS
|
||||
#include "tree234.h"
|
||||
#include "putty.h"
|
||||
#include "network.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче