kill-afs-warning-message-20010712

[openafs.git] / src / util / afsutil.h

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 4430693..0d93eab 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -57,8 +57,8 @@ extern char *vctime(const time_t *atime);
 
 
 /* Convert a 4 byte integer to a text string. */
-extern char*   afs_inet_ntoa(afs_int32 addr);
-
+extern char*   afs_inet_ntoa(afs_uint32 addr);
+extern char*    afs_inet_ntoa_r(afs_uint32 addr, char *buf);
 
 /* copy strings, converting case along the way. */
 extern char *lcstring(char *d, char *s, int n);
@@ -74,7 +74,9 @@ extern char *strcompose(char *buf, size_t len, ...);
 
 
 #ifdef AFS_NT40_ENV
+#ifndef _MFC_VER
 #include <winsock2.h>
+#endif /* _MFC_VER */
 
 /* Initialize the windows sockets before calling networking routines. */
 extern int afs_winsockInit(void);
@@ -112,29 +114,15 @@ int base32_to_int(char *s);
  * early in name.
  */
 typedef char lb64_string_t[12];
-char *int64_to_flipbase64(b64_string_t s, uint64_t a);
+#ifdef AFS_64BIT_ENV
+#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (afs_int64)(A))
+char *int64_to_flipbase64(b64_string_t s, afs_int64 a);
+afs_int64 flipbase64_to_int64(char *s);
+#else
+#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (u_int64_t)(A))
+char *int64_to_flipbase64(b64_string_t s, u_int64_t a);
 int64_t flipbase64_to_int64(char *s);
-#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (uint64_t)(A))
 #endif
-
-/* This message preserves our ability to license AFS to the U.S. Government
- * more than once.
- */
-
-#define AFS_GOVERNMENT_MESSAGE \
-"===================== U.S. Government Restricted Rights ======================\n\
-If you are licensing the Software on behalf of the U.S. Government\n\
-(\"Government\"), the following provisions apply to you.  If the Software is\n\
-supplied to the Department of Defense (\"DoD\"), it is classified as \"Commercial\n\
-Computer Software\" under paragraph 252.227-7014 of the DoD Supplement to the\n\
-Federal Acquisition Regulations (\"DFARS\") (or any successor regulations)\n\
-and the Government is acquiring only the license rights granted herein (the\n\
-license rights customarily provided to non-Government users).  If the Software\n\
-is supplied to any unit or agency of the Government other than DoD, it is\n\
-classified as \"Restricted Computer Software\" and the Government's rights in\n\
-the Software are defined in paragraph 52.227-19 of the Federal Acquisition\n\
-Regulations (\"FAR\") (or any successor regulations) or, in the case of NASA,\n\
-in paragraph 18.52.227-86 of the NASA Supplement in the FAR (or any successor\n\
-regulations).\n"
+#endif
 
 #endif /* _AFSUTIL_H_ */