Reverting to 398.. trying again with native charybdis hash

[irc/rqf/shadowircd.git] / include / stdinc.h

diff --git a/include/stdinc.h b/include/stdinc.h
index 43f99a044eeac479eb615fe28a7dcd1df8236a07..8efe33be708c4ab8eba8d173f1da26763716afcb 100644 (file)
--- a/include/stdinc.h
+++ b/include/stdinc.h
@@ -140,7 +140,8 @@ extern int errno;
 # define __noreturn
 #endif
 
-/* XXX must be removed in future!!! -- dwr */
+
+
 #ifdef strdupa
 #define LOCAL_COPY(s) strdupa(s) 
 #else
@@ -149,28 +150,4 @@ extern int errno;
 #else
 # define LOCAL_COPY(s) strcpy(alloca(strlen(s) + 1), s) /* XXX Is that allowed? */
 #endif /* defined(__INTEL_COMPILER) || defined(__GNUC__) */
-
-/* LOCAL_COPY_N copies n part of string and adds one to terminate the string */\r
-#ifdef strndupa \r
-#define LOCAL_COPY_N(s, n) strndupa(s, n)\r
-#else\r
-#if defined(__INTEL_COMPILER) || defined(__GNUC__)\r
-#define LOCAL_COPY_N(s, n) __extension__({ size_t _l = strlen(s); _l = n > _l ? _l : n; char *_s = alloca(_l+1); memcpy(_s, s, _l); _s[_l] = '\0' ; _s; })\r
-#else\r
-#define LOCAL_COPY_N(s, n) xc_strlcpy(alloca(strlen(s)+1), s, n)\r
-INLINE_FUNC size_t\r
-xc_strlcpy(char *dest, const char *src, size_t size)\r
-{ \r
-        size_t ret = strlen(src);\r
-   \r
-        if (size) {\r
-                size_t len = (ret >= size) ? size-1 : ret;\r
-                memcpy(dest, src, len);\r
-                dest[len] = '\0';\r
-        }\r
-        return dest;\r
-}\r
-#endif /* defined(__INTEL_COMPILER) || defined(__GNUC__) */\r
-#endif /* strndupa */
-
 #endif /* strdupa */