Use lowercased macros

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95620 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index c1580c68af95fcf0147d2747d17d1f30e0c1fe7c..2be23d5cac3abd14247481f0b05c140510e1480f 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -145,8 +145,8 @@ typedef struct digest_config_struct {
 
 #define DFLT_ALGORITHM  "MD5"
 
-#define DFLT_NONCE_LIFE APR_TIME_FROM_SEC(300)
-#define NEXTNONCE_DELTA APR_TIME_FROM_SEC(30)
+#define DFLT_NONCE_LIFE apr_time_from_sec(300)
+#define NEXTNONCE_DELTA apr_time_from_sec(30)
 
 
 #define NONCE_TIME_LEN  (((sizeof(apr_time_t)+2)/3)*4)
@@ -543,7 +543,7 @@ static const char *set_nonce_lifetime(cmd_parms *cmd, void *config,
                            t, NULL);
     }
 
-    ((digest_config_rec *) config)->nonce_lifetime = APR_TIME_FROM_SEC(lifetime);
+    ((digest_config_rec *) config)->nonce_lifetime = apr_time_from_sec(lifetime);
     return NULL;
 }
 

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 3f3eef24deb6fad6c2c657ce9d64875470bb930b..636f2f5411e018d2181bdf2fdba91957b882ab3c 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -96,7 +96,7 @@
 #include "mod_isapi.h"
 
 /* Retry frequency for a failed-to-load isapi .dll */
-#define ISAPI_RETRY APR_TIME_FROM_SEC(30)
+#define ISAPI_RETRY apr_time_from_sec(30)
 
 /**********************************************************
  *

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 4b38f56fc703314ed22c26dcde0f77c401c9c0e7..cf8eb83b25a427fd1907233f3c2d8eee06426e78 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -967,7 +967,7 @@ static int connect_to_daemon(int *sdptr, request_rec *r,
                               connect_tries);
                 close(sd);
                 apr_sleep(sliding_timer);
-                if (sliding_timer < APR_TIME_FROM_SEC(2)) {
+                if (sliding_timer < apr_time_from_sec(2)) {
                     sliding_timer *= 2;
                 }
             }