mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-16 12:03:03 -05:00
Remove the switching system in puttyps.h.
It was there because of a limitation of mkfiles.pl, which had a single list of include directories that it used on all platforms. CMake does not. So now there's an easier and more sensible way to have a different header file included on Windows and Unix: call it the same name in the two subdirectories, and rely on CMake having put the right one of those subdirs on the include path.
This commit is contained in:
parent
1c61fdf800
commit
b00e5fb129
2
putty.h
2
putty.h
@ -5,7 +5,7 @@
|
|||||||
#include <limits.h> /* for INT_MAX */
|
#include <limits.h> /* for INT_MAX */
|
||||||
|
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
#include "puttyps.h"
|
#include "platform.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "marshal.h"
|
#include "marshal.h"
|
||||||
|
18
puttyps.h
18
puttyps.h
@ -1,18 +0,0 @@
|
|||||||
/*
|
|
||||||
* Find the platform-specific header for this platform.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PUTTY_PUTTYPS_H
|
|
||||||
#define PUTTY_PUTTYPS_H
|
|
||||||
|
|
||||||
#ifdef _WINDOWS
|
|
||||||
|
|
||||||
#include "winstuff.h"
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include "unix.h"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,5 +1,9 @@
|
|||||||
#ifndef PUTTY_UNIX_H
|
/*
|
||||||
#define PUTTY_UNIX_H
|
* unix/platform.h: Unix-specific inter-module stuff.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PUTTY_UNIX_PLATFORM_H
|
||||||
|
#define PUTTY_UNIX_PLATFORM_H
|
||||||
|
|
||||||
#if HAVE_CMAKE_H
|
#if HAVE_CMAKE_H
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
@ -457,4 +461,4 @@ bool cliloop_no_pw_setup(void *ctx, pollwrapper *pw);
|
|||||||
void cliloop_no_pw_check(void *ctx, pollwrapper *pw);
|
void cliloop_no_pw_check(void *ctx, pollwrapper *pw);
|
||||||
bool cliloop_always_continue(void *ctx, bool, bool);
|
bool cliloop_always_continue(void *ctx, bool, bool);
|
||||||
|
|
||||||
#endif /* PUTTY_UNIX_H */
|
#endif /* PUTTY_UNIX_PLATFORM_H */
|
@ -1,9 +1,9 @@
|
|||||||
/*
|
/*
|
||||||
* winstuff.h: Windows-specific inter-module stuff.
|
* windows/platform.h: Windows-specific inter-module stuff.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef PUTTY_WINSTUFF_H
|
#ifndef PUTTY_WINDOWS_PLATFORM_H
|
||||||
#define PUTTY_WINSTUFF_H
|
#define PUTTY_WINDOWS_PLATFORM_H
|
||||||
|
|
||||||
#if HAVE_CMAKE_H
|
#if HAVE_CMAKE_H
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
@ -708,4 +708,4 @@ void cli_main_loop(cliloop_pre_t pre, cliloop_post_t post, void *ctx);
|
|||||||
bool cliloop_null_pre(void *vctx, const HANDLE **, size_t *);
|
bool cliloop_null_pre(void *vctx, const HANDLE **, size_t *);
|
||||||
bool cliloop_null_post(void *vctx, size_t);
|
bool cliloop_null_post(void *vctx, size_t);
|
||||||
|
|
||||||
#endif
|
#endif /* PUTTY_WINDOWS_PLATFORM_H */
|
Loading…
x
Reference in New Issue
Block a user