Fix build for HP-UX and older Solaris: (un)setenv. Bug 1578

[exim.git] / src / src / tls.c

diff --git a/src/src/tls.c b/src/src/tls.c
index 6b1a189a98dfaa5b87caccdabb3e2dceff9dedc5..0406a10f98787f72caabb8a54983141ad43e2dbc 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -87,19 +87,20 @@ return TRUE;
 static uschar *
 to_tz(uschar * tz)
 {
-  uschar * old = US getenv("TZ");
-  setenv("TZ", CS tz, 1);
-  tzset(); 
-  return old;
+uschar * old = US getenv("TZ");
+(void) setenv("TZ", CCS tz, 1);
+tzset(); 
+return old;
 }
+
 static void
 restore_tz(uschar * tz)
 {
-  if (tz)
-    setenv("TZ", CS tz, 1);
-  else
-    unsetenv("TZ");
-  tzset(); 
+if (tz)
+  (void) setenv("TZ", CCS tz, 1);
+else
+  (void) unsetenv("TZ");
+tzset(); 
 }
 
 /*************************************************
@@ -107,18 +108,18 @@ restore_tz(uschar * tz)
 *************************************************/
 
 #ifdef USE_GNUTLS
-#include "tls-gnu.c"
-#include "tlscert-gnu.c"
+# include "tls-gnu.c"
+# include "tlscert-gnu.c"
 
-#define ssl_xfer_buffer (state_server.xfer_buffer)
-#define ssl_xfer_buffer_lwm (state_server.xfer_buffer_lwm)
-#define ssl_xfer_buffer_hwm (state_server.xfer_buffer_hwm)
-#define ssl_xfer_eof (state_server.xfer_eof)
-#define ssl_xfer_error (state_server.xfer_error)
+# define ssl_xfer_buffer (state_server.xfer_buffer)
+# define ssl_xfer_buffer_lwm (state_server.xfer_buffer_lwm)
+# define ssl_xfer_buffer_hwm (state_server.xfer_buffer_hwm)
+# define ssl_xfer_eof (state_server.xfer_eof)
+# define ssl_xfer_error (state_server.xfer_error)
 
 #else
-#include "tls-openssl.c"
-#include "tlscert-openssl.c"
+# include "tls-openssl.c"
+# include "tlscert-openssl.c"
 #endif