mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Changed a lot of __MINGW32__ to _WIN32. This should help a bit in
building with native Windows compilers. On request by Brian Gladman.
This commit is contained in:
parent
ee923fb897
commit
da4bf59349
42 changed files with 415 additions and 393 deletions
16
util/ttyio.c
16
util/ttyio.c
|
@ -37,10 +37,10 @@
|
|||
#define HAVE_TCGETATTR
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __MINGW32__ /* use the odd Win32 functions */
|
||||
#ifdef _WIN32 /* use the odd Win32 functions */
|
||||
#include <windows.h>
|
||||
#ifdef HAVE_TCGETATTR
|
||||
#error mingw32 and termios
|
||||
#error windows and termios
|
||||
#endif
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
@ -51,7 +51,7 @@
|
|||
|
||||
#define CONTROL_D ('D' - 'A' + 1)
|
||||
|
||||
#ifdef __MINGW32__ /* use the odd Win32 functions */
|
||||
#ifdef _WIN32 /* use the odd Win32 functions */
|
||||
static struct {
|
||||
HANDLE in, out;
|
||||
} con;
|
||||
|
@ -124,7 +124,7 @@ init_ttyfp(void)
|
|||
if( initialized )
|
||||
return;
|
||||
|
||||
#if defined(__MINGW32__)
|
||||
#if defined(_WIN32)
|
||||
{
|
||||
SECURITY_ATTRIBUTES sa;
|
||||
|
||||
|
@ -194,7 +194,7 @@ tty_printf( const char *fmt, ... )
|
|||
init_ttyfp();
|
||||
|
||||
va_start( arg_ptr, fmt ) ;
|
||||
#ifdef __MINGW32__
|
||||
#ifdef _WIN32
|
||||
{
|
||||
char *buf = NULL;
|
||||
int n;
|
||||
|
@ -231,7 +231,7 @@ tty_print_string( byte *p, size_t n )
|
|||
if( !initialized )
|
||||
init_ttyfp();
|
||||
|
||||
#ifdef __MINGW32__
|
||||
#ifdef _WIN32
|
||||
/* not so effective, change it if you want */
|
||||
for( ; n; n--, p++ )
|
||||
if( iscntrl( *p ) ) {
|
||||
|
@ -325,7 +325,7 @@ do_get( const char *prompt, int hidden )
|
|||
buf = m_alloc(n=50);
|
||||
i = 0;
|
||||
|
||||
#ifdef __MINGW32__ /* windoze version */
|
||||
#ifdef _WIN32 /* windoze version */
|
||||
if( hidden )
|
||||
SetConsoleMode(con.in, HID_INPMODE );
|
||||
|
||||
|
@ -480,7 +480,7 @@ tty_kill_prompt()
|
|||
last_prompt_len = 0;
|
||||
if( !last_prompt_len )
|
||||
return;
|
||||
#ifdef __MINGW32__
|
||||
#ifdef _WIN32
|
||||
tty_printf("\r%*s\r", last_prompt_len, "");
|
||||
#else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue