diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
| commit | a0b9ce4bee60136363cfff7a93c4e42eab972c02 (patch) | |
| tree | 400984337fe3766653ff4cc2cb6b7d3d7f87f3f4 /src/lib/crypto/os | |
| parent | a9266b1dec31de9f33b0d032b885edd377a23ee5 (diff) | |
Windows/NT integration (V1_0_WIN32_BRANCH merge)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/os')
| -rw-r--r-- | src/lib/crypto/os/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lib/crypto/os/Makefile.in | 12 | ||||
| -rw-r--r-- | src/lib/crypto/os/c_ustime.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/os/rnd_confoun.c | 4 |
4 files changed, 22 insertions, 6 deletions
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index 3671f1349..97f79106d 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,13 @@ +Thu Nov 21 00:58:04 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: Win32 build + + * c_ustime.c: The Win32 time calculation is different from DOS' + so the DOS version shouldn't be trying to use the same + part of the ifdef. + + * rnd_confoun.c: Fix function declaration (win32) + Wed Jun 12 00:12:52 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * c_ustime.c: Fix WIN32 to be _WIN32 diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in index 46e734d11..134e5c918 100644 --- a/src/lib/crypto/os/Makefile.in +++ b/src/lib/crypto/os/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\crypto.lib +##DOSMYNAME=os +##DOSOBJFILE=..\os.lst +##WIN16##LIBNAME=..\crypto.lib LIBOBJS = @LIBOBJS@ @@ -15,10 +17,13 @@ OBJS= $(COBJS) $(LIBOBJS) SRCS= rnd_confoun.c c_localaddr.c c_ustime.c all-unix:: shared $(OBJS) - all-mac:: $(OBJS) +all-windows:: $(OBJFILE) -all-windows: $(COBJS) +##DOS$(OBJFILE): $(COBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -39,3 +44,4 @@ clean-unix:: clean-mac:: $(RM) shared/* clean-windows:: + $(RM) $(OBJFILE) diff --git a/src/lib/crypto/os/c_ustime.c b/src/lib/crypto/os/c_ustime.c index 8b539463f..57606de10 100644 --- a/src/lib/crypto/os/c_ustime.c +++ b/src/lib/crypto/os/c_ustime.c @@ -121,7 +121,7 @@ krb5_crypto_us_timeofday(seconds, microseconds) } -#elif defined(_WIN32) || defined(_MSDOS) +#elif defined(_WIN32) /* Microsoft Windows NT and 95 (32bit) */ /* This one works for WOW (Windows on Windows, ntvdm on Win-NT) */ diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c index 8db32d156..e904cb5c7 100644 --- a/src/lib/crypto/os/rnd_confoun.c +++ b/src/lib/crypto/os/rnd_confoun.c @@ -60,9 +60,9 @@ You need a random number generator! /* * Generate a random confounder */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_random_confounder(size, fillin) -int size; +size_t size; krb5_pointer fillin; { static int seeded = 0; |