wrowe · wrowe · commit 522798e06bd4 · 2002-06-12T22:27:37.000Z
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
@@ -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
@@ -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
@@ -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;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ typedef struct digest_config_struct {`
`145`	`145`
`146`	`146`	`#define DFLT_ALGORITHM "MD5"`
`147`	`147`
`148`		`-#define DFLT_NONCE_LIFE APR_TIME_FROM_SEC(300)`
`149`		`-#define NEXTNONCE_DELTA APR_TIME_FROM_SEC(30)`
	`148`	`+#define DFLT_NONCE_LIFE apr_time_from_sec(300)`
	`149`	`+#define NEXTNONCE_DELTA apr_time_from_sec(30)`
`150`	`150`
`151`	`151`
`152`	`152`	`#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,`
`543`	`543`	`t, NULL);`
`544`	`544`	`}`
`545`	`545`
`546`		`- ((digest_config_rec *) config)->nonce_lifetime = APR_TIME_FROM_SEC(lifetime);`
	`546`	`+ ((digest_config_rec *) config)->nonce_lifetime = apr_time_from_sec(lifetime);`
`547`	`547`	`return NULL;`
`548`	`548`	`}`
`549`	`549`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`#include "mod_isapi.h"`
`97`	`97`
`98`	`98`	`/* Retry frequency for a failed-to-load isapi .dll */`
`99`		`-#define ISAPI_RETRY APR_TIME_FROM_SEC(30)`
	`99`	`+#define ISAPI_RETRY apr_time_from_sec(30)`
`100`	`100`
`101`	`101`	`/**********************************************************`
`102`	`102`	`*`
Original file line number	Diff line number	Diff line change
`@@ -967,7 +967,7 @@ static int connect_to_daemon(int sdptr, request_rec r,`
`967`	`967`	`connect_tries);`
`968`	`968`	`close(sd);`
`969`	`969`	`apr_sleep(sliding_timer);`
`970`		`- if (sliding_timer < APR_TIME_FROM_SEC(2)) {`
	`970`	`+ if (sliding_timer < apr_time_from_sec(2)) {`
`971`	`971`	`sliding_timer *= 2;`
`972`	`972`	`}`
`973`	`973`	`}`