git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire old libsrs_alt -based SRS support. Bug 1649
[exim.git]
/
src
/
src
/
buildconfig.c
diff --git
a/src/src/buildconfig.c
b/src/src/buildconfig.c
index 3d404f100865e59e6519a2ee3f7e25d248ad4fa0..a680b344a9bfae408ca667425a59bbc84d4f9bec 100644
(file)
--- a/
src/src/buildconfig.c
+++ b/
src/src/buildconfig.c
@@
-111,6
+111,7
@@
unsigned long test_ulong_t = 0L;
unsigned int test_uint_t = 0;
#endif
long test_long_t = 0;
unsigned int test_uint_t = 0;
#endif
long test_long_t = 0;
+long long test_longlong_t = 0;
int test_int_t = 0;
FILE *base;
FILE *new;
int test_int_t = 0;
FILE *base;
FILE *new;
@@
-155,15
+156,16
@@
This assumption is known to be OK for the common operating systems. */
fprintf(new, "#ifndef OFF_T_FMT\n");
if (sizeof(test_off_t) > sizeof(test_long_t))
fprintf(new, "#ifndef OFF_T_FMT\n");
if (sizeof(test_off_t) > sizeof(test_long_t))
- {
fprintf(new, "# define OFF_T_FMT \"%%lld\"\n");
fprintf(new, "# define OFF_T_FMT \"%%lld\"\n");
- fprintf(new, "# define LONGLONG_T long long int\n");
- }
else
else
- {
fprintf(new, "# define OFF_T_FMT \"%%ld\"\n");
fprintf(new, "# define OFF_T_FMT \"%%ld\"\n");
+fprintf(new, "#endif\n\n");
+
+fprintf(new, "#ifndef LONGLONG_T\n");
+if (sizeof(test_longlong_t) > sizeof(test_long_t))
+ fprintf(new, "# define LONGLONG_T long long int\n");
+else
fprintf(new, "# define LONGLONG_T long int\n");
fprintf(new, "# define LONGLONG_T long int\n");
- }
fprintf(new, "#endif\n\n");
/* Now do the same thing for time_t variables. If the length is greater than
fprintf(new, "#endif\n\n");
/* Now do the same thing for time_t variables. If the length is greater than
@@
-753,15
+755,15
@@
else if (isgroup)
continue;
}
continue;
}
- /* DISABLE_DKIM is special; must be forced if
no SUPPORT
_TLS */
+ /* DISABLE_DKIM is special; must be forced if
DISABLE
_TLS */
if (strcmp(name, "DISABLE_DKIM") == 0)
{
char *d_dkim = getenv("DISABLE_DKIM");
if (strcmp(name, "DISABLE_DKIM") == 0)
{
char *d_dkim = getenv("DISABLE_DKIM");
- char *
tls = getenv("SUPPORT
_TLS");
+ char *
notls = getenv("DISABLE
_TLS");
if (d_dkim)
fprintf(new, "#define DISABLE_DKIM yes\n");
if (d_dkim)
fprintf(new, "#define DISABLE_DKIM yes\n");
- else if (
!
tls)
+ else if (
no
tls)
fprintf(new, "#define DISABLE_DKIM yes /* forced by lack of TLS */\n");
else
fprintf(new, "/* DISABLE_DKIM not set */\n");
fprintf(new, "#define DISABLE_DKIM yes /* forced by lack of TLS */\n");
else
fprintf(new, "/* DISABLE_DKIM not set */\n");
@@
-953,21
+955,18
@@
else if (isgroup)
defined. */
if (have_auth)
defined. */
if (have_auth)
- {
if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n"
"#define SUPPORT_CRYPTEQ\n");
if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n"
"#define SUPPORT_CRYPTEQ\n");
- }
/* Check poll() for timer functionality.
Some OS' have released with it broken. */
{
struct timeval before, after;
/* Check poll() for timer functionality.
Some OS' have released with it broken. */
{
struct timeval before, after;
- int rc;
size_t us;
gettimeofday(&before, NULL);
size_t us;
gettimeofday(&before, NULL);
-
rc =
poll(NULL, 0, 500);
+
(void)
poll(NULL, 0, 500);
gettimeofday(&after, NULL);
us = (after.tv_sec - before.tv_sec) * 1000000 +
gettimeofday(&after, NULL);
us = (after.tv_sec - before.tv_sec) * 1000000 +