Remove lint, remove YEAR_PEDANTIC macro, update comment.

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 4d6e6c8db7dd255ae0bc8c4146c7f108dcc78c37..729c5d7902a4502c3e77de0dea9dbaf60d1d5c9a 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -95,7 +95,7 @@ ldap_connect_to_host( Sockbuf *sb, const char *host, unsigned long address,
                {
                        int tmp = 1;
                        if( setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-                               &tmp, sizeof(tmp) ) == -1 )
+                               (char *) &tmp, sizeof(tmp) ) == -1 )
                        {
                                Debug( LDAP_DEBUG_ANY,
                                        "setsockopt(TCP_NODELAY failed on %d\n",

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index cfa29ee2f57ea31250ae19e0978d0465ecc32a8d..74e7d48cc7bd4d4b334292bca3628627e1e7dafc 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -951,7 +951,7 @@ static const int dmsize[] = {
 /*
  * Y2K YEAR
  */
-       /* per POSIX tm_year should be offset by 1900 */
+       /* per STDC & POSIX tm_year should be offset by 1900 */
 #define YEAR_POSIX(y)          ((y) + 1900)
 
        /*
@@ -959,15 +959,6 @@ static const int dmsize[] = {
         */
 #define YEAR_CAREFUL(y)                ((y) < 1900 ? (y) + 1900 : (y))
 
-       /*
-       ** if year is < 1990 and < 70 must be offset by 2000 as Unix epoch
-       ** started in 1970.  if year is < 1990 but >= 70, offset by 1900.
-       ** if year is >= 1900, it must be the real year.
-       */ 
-#define YEAR_PEDANTIC(y)               ((y) < 1900 \
-                                               ? ((y) < 70 ? (y) + 2000 ? (y) + 1900) \
-                                               : (y))
-
 #define YEAR(y) YEAR_CAREFUL(y)
 
 /* \f */