зеркало из https://github.com/github/putty.git
Remove the GLOBAL macro itself.
Now it's no longer used, we can get rid of it, and better still, get rid of every #define PUTTY_DO_GLOBALS in the many source files that previously had them.
This commit is contained in:
Родитель
0709de08f2
Коммит
9729aabd94
2
cmdgen.c
2
cmdgen.c
|
@ -2,8 +2,6 @@
|
||||||
* cmdgen.c - command-line form of PuTTYgen
|
* cmdgen.c - command-line form of PuTTYgen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "terminal.h"
|
#include "terminal.h"
|
||||||
|
|
||||||
|
|
1
pscp.c
1
pscp.c
|
@ -19,7 +19,6 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "psftp.h"
|
#include "psftp.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
|
|
1
psftp.c
1
psftp.c
|
@ -8,7 +8,6 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "psftp.h"
|
#include "psftp.h"
|
||||||
#include "storage.h"
|
#include "storage.h"
|
||||||
|
|
|
@ -27,10 +27,6 @@
|
||||||
#include "x11misc.h"
|
#include "x11misc.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TESTMODE
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "storage.h"
|
#include "storage.h"
|
||||||
#include "dialog.h"
|
#include "dialog.h"
|
||||||
#include "tree234.h"
|
#include "tree234.h"
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
#include <gtk/gtkimmodule.h>
|
#include <gtk/gtkimmodule.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
|
|
||||||
#define MAY_REFER_TO_GTK_IN_HEADERS
|
#define MAY_REFER_TO_GTK_IN_HEADERS
|
||||||
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "storage.h"
|
#include "storage.h"
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "mpint.h"
|
#include "mpint.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
#define COMPILE_MULTIMON_STUBS
|
#define COMPILE_MULTIMON_STUBS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "terminal.h"
|
#include "terminal.h"
|
||||||
#include "storage.h"
|
#include "storage.h"
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "licence.h"
|
#include "licence.h"
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <tchar.h>
|
#include <tchar.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS
|
|
||||||
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
|
||||||
#include "putty.h"
|
#include "putty.h"
|
||||||
#include "storage.h"
|
#include "storage.h"
|
||||||
#include "tree234.h"
|
#include "tree234.h"
|
||||||
|
|
|
@ -157,19 +157,6 @@ struct FontSpec *fontspec_new(
|
||||||
(p_##name = module ? \
|
(p_##name = module ? \
|
||||||
(t_##name) GetProcAddress(module, #name) : NULL)
|
(t_##name) GetProcAddress(module, #name) : NULL)
|
||||||
|
|
||||||
/*
|
|
||||||
* Global variables. Most modules declare these `extern', but
|
|
||||||
* window.c will do `#define PUTTY_DO_GLOBALS' before including this
|
|
||||||
* module, and so will get them properly defined.
|
|
||||||
*/
|
|
||||||
#ifndef GLOBAL
|
|
||||||
#ifdef PUTTY_DO_GLOBALS
|
|
||||||
#define GLOBAL
|
|
||||||
#else
|
|
||||||
#define GLOBAL extern
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
|
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
|
||||||
#define PUTTY_REG_PARENT "Software\\SimonTatham"
|
#define PUTTY_REG_PARENT "Software\\SimonTatham"
|
||||||
#define PUTTY_REG_PARENT_CHILD "PuTTY"
|
#define PUTTY_REG_PARENT_CHILD "PuTTY"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче