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/krb5/posix | |
| parent | a9266b1dec31de9f33b0d032b885edd377a23ee5 (diff) | |
| download | krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.zip krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.gz krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.bz2 | |
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/krb5/posix')
| -rw-r--r-- | src/lib/krb5/posix/ChangeLog | 9 | ||||
| -rw-r--r-- | src/lib/krb5/posix/Makefile.in | 16 | ||||
| -rw-r--r-- | src/lib/krb5/posix/sscanf.c | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index e94ad00..76d7a62 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,12 @@ +Tue Feb 4 15:54:11 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: Only build sscanf for Win16 + * sscanf.c: Export sscanf in Windows DLL + +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + Mon Jun 10 21:51:35 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * syslog.c: Change _WINDOWS to _MSDOS, and add check for _WIN32. diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index c056c0c..f1475ed 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=posix +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -13,7 +15,15 @@ OBJS = setenv.$(OBJEXT) @LIBOBJS@ all-unix:: shared $(OBJS) all-mac: $(OBJS) -all-windows:: syslog.obj sscanf.obj +all-windows:: $(OBJFILE) + +##WIN16##$(OBJFILE): syslog.obj sscanf.obj +##WIN16## $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) + +##WIN32##$(OBJFILE): syslog.obj +##WIN32## $(RM) $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -23,5 +33,5 @@ clean-unix:: clean-mac:: clean-windows:: - + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/posix/sscanf.c b/src/lib/krb5/posix/sscanf.c index 3dbc415..9a96ff9 100644 --- a/src/lib/krb5/posix/sscanf.c +++ b/src/lib/krb5/posix/sscanf.c @@ -49,6 +49,8 @@ #include <stdarg.h> #include <string.h> +#include "k5-int.h" + #if 0 #if __STDC__ #include <stdarg.h> @@ -104,7 +106,7 @@ static u_char *__sccl(char *tab, u_char *fmt); /* * sscanf */ -int +KRB5_DLLIMP int KRB5_CALLCONV_C sscanf(char *str, char const *fmt0, ...) { va_list ap; |