From e1982960806570b413770779b4342df75c56eb2e Mon Sep 17 00:00:00 2001 From: Owen Dunn Date: Thu, 4 Nov 1999 11:26:07 +0000 Subject: [PATCH] Can now build with /DWIN32S_COMPAT to work (minimally) with Win32s git-svn-id: http://svn.tartarus.org/sgt/putty@271 cda61777-01e9-0310-a592-d414129be87e --- Makefile | 7 +++++-- noise.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 73ea2406..37628e82 100644 --- a/Makefile +++ b/Makefile @@ -5,15 +5,18 @@ # `VER=/DRELEASE=0.43' to get version numbering; otherwise you'll # get `Unidentified build'. +# COMPAT=/DWIN32S_COMPAT will produce a binary that works (minimally) +# with Win32s + CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd .c.obj: - cl $(FWHACK) $(CFLAGS) /c $*.c + cl $(COMPAT) $(FWHACK) $(CFLAGS) /c $*.c PUTTYOBJS = window.obj windlg.obj terminal.obj telnet.obj raw.obj OBJS1 = misc.obj noise.obj OBJS2 = ssh.obj sshcrc.obj sshdes.obj sshmd5.obj sshrsa.obj sshrand.obj -OBJS3 = sshsha.obj sshblowf.obj version.obj sizetip.c +OBJS3 = sshsha.obj sshblowf.obj version.obj sizetip.obj RESRC = win_res.res LIBS1 = advapi32.lib user32.lib gdi32.lib LIBS2 = wsock32.lib comctl32.lib comdlg32.lib diff --git a/noise.c b/noise.c index 3ff00be6..31004ddf 100644 --- a/noise.c +++ b/noise.c @@ -124,8 +124,10 @@ void noise_get_light(void (*func) (void *, int)) { GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish); func(&adjust, sizeof(adjust)); +#ifndef WIN32S_COMPAT if (GetSystemPowerStatus(&pwrstat)) func(&pwrstat, sizeof(pwrstat)); +#endif } /* -- 2.45.2