Some windows i/o stuff and moved 2 prototypes to func-proto.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5127 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 031e54374933226bdf98ffdf4548e00c6bf28e91..115717799e33289a1921176205110910963ab8b8 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar 14 17:38:28 1995 Keith Vetter (keithv@fusion.com)
+
+       * k5-config.h: more PC changes, mostly dealing with chmod not 
+          working as it should on the PC.
+       * func-proto.h, los-proto.h: moved prototypes for krb5_timeofday and
+          krb5_os_localaddr from los-proto to func-proto. They are needed by
+          the outside world, specifically kinit.c
+
 Fri Mar 10 14:23:12 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * sysincl.h: Removed definition of FD_SETSIZE, FD_SET, FD_CLR,

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index 3609b976d73b93e56709117402649e5261bbee86..0d756859d180482a6c2a14ce3e70d1120803b694 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -412,6 +412,14 @@ void INTERFACE krb5_free_pwd_sequences
    PROTOTYPE((krb5_context,
          passwd_phrase_element **));
 
+/* From krb5/os but needed but by the outside world */
+krb5_error_code INTERFACE krb5_timeofday
+       PROTOTYPE((krb5_context,
+                  krb5_int32 * ));
+                /* get all the addresses of this host */
+krb5_error_code INTERFACE krb5_os_localaddr
+       PROTOTYPE((krb5_address ***));
+
 /* Only put things which don't have pointers to the narrow types in this
    section */
 

diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index 10a7b46531ad5660db2108a9b93df6b408c9098a..c28b6967d08a7007b310e818c6dd043034e93c6e 100644 (file)
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -48,6 +48,7 @@
 #define HAS_STRDUP
 #define NO_USERID
 #define NOFCHMOD
+#define NOCHMOD
 
 #define HAS_ANSI_CONST                          /* For compiling w/o -Za */
 #define HAS_ANSI_VOLATILE
@@ -83,6 +84,10 @@ typedef unsigned char u_char;
 #define _cdecl  __cdecl
 #define _huge   __huge
 
+#ifdef NEED_WINDOWS
+#include <windows.h>
+#endif
+
 #ifdef NEED_SOCKETS
 #include <winsock.h>
 #endif
@@ -92,6 +97,8 @@ typedef unsigned char u_char;
  * routines directly. Rather, they only export the _<function> version.
  * The following defines works around this problem. 
  */
+#include <sys\types.h>
+#include <sys\stat.h>
 #include <fcntl.h>
 #include <io.h>
 #include <process.h>
@@ -117,11 +124,9 @@ typedef unsigned char u_char;
 #define close           _close
 #define read            _read
 #define fstat           _fstat
-#define chmod           _chmod
 #define mktemp          _mktemp
 
 #define getpid          _getpid
-
 #endif
 
 /* XXX these should be parameterized soon... */

diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 4a2ecade1ba9147e6c5a72263a48c48ad37ca1b0..cf8b5a76271c39c6ecb5080ad69898d5f1c8581f 100644 (file)
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -50,9 +50,6 @@ krb5_error_code INTERFACE krb5_unlock_file
        PROTOTYPE((krb5_context,
                   FILE *,
                   char * ));
-krb5_error_code INTERFACE krb5_timeofday
-       PROTOTYPE((krb5_context,
-                  krb5_int32 * ));
 krb5_error_code INTERFACE krb5_us_timeofday
        PROTOTYPE((krb5_context,
                   krb5_int32 *,
@@ -67,9 +64,6 @@ int INTERFACE krb5_net_write
                   int ,
                   const char *,
                   int  ));
-                /* get all the addresses of this host */
-krb5_error_code INTERFACE krb5_os_localaddr
-       PROTOTYPE((krb5_address ***));
 krb5_error_code INTERFACE krb5_sendto_kdc
        PROTOTYPE((krb5_context,
                   const krb5_data *,