4 files changed, 11 insertions, 23 deletions

diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 69acfc9dfd..a2ef0db83c 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -1346,7 +1346,7 @@ static void invoke_preadv(void *data)
 	      = efile_pread(&d->errInfo, 
 			    (int) d->fd,
 			    c->offsets[c->cnt] + c->size,
-			    ev->iov[1 + c->cnt].iov_base + c->size,
+			    ((char *)ev->iov[1 + c->cnt].iov_base) + c->size,
 			    read_size,
 			    &bytes_read))) {
 	    bytes_read_so_far += bytes_read;
@@ -1641,7 +1641,7 @@ static void invoke_pwritev(void *data) {
 		- c->free_size;
 	}
 	d->result_ok = efile_pwrite(&d->errInfo, (int) d->fd,
-				    iov[iovcnt].iov_base + p,
+				    (char *)(iov[iovcnt].iov_base) + p,
 				    write_size,
 				    c->specs[c->cnt].offset);
 	if (! d->result_ok) {
@@ -2559,7 +2559,7 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
 	      reply_Sint64(desc, d->c.sendfile.written);
 	      desc->sendfile_state = not_sending;
 	      free_sendfile(data);
-	  } else if (d->result_ok == 1) { // If we are using select to send the rest of the data
+	  } else if (d->result_ok == 1) { /* If we are using select to send the rest of the data */
 	      desc->sendfile_state = sending;
 	      desc->d = d;
 	      driver_select(desc->port, (ErlDrvEvent)(long)d->c.sendfile.out_fd,
@@ -3813,7 +3813,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
 	res_ev->iov[0].iov_base = res_ev->binv[0]->orig_bytes;
 	/* Fill in the number of buffers in the header */
 	put_int32(0, res_ev->iov[0].iov_base);
-	put_int32(n, res_ev->iov[0].iov_base+4);
+	put_int32(n, (char *)(res_ev->iov[0].iov_base) + 4);
 	/**/
 	res_ev->size = res_ev->iov[0].iov_len;
 	if (n == 0) {
@@ -4114,7 +4114,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
 	}
 
 	if (hd_len != 0 || tl_len != 0 || flags != 0) {
-	    // We do not allow header, trailers and/or flags right now
+	    /* We do not allow header, trailers and/or flags right now */
 	    reply_posix_error(desc, EINVAL);
 	    goto done;
 	}
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h
index b29b4f971c..bd85e43b8c 100644
--- a/erts/emulator/drivers/common/erl_efile.h
+++ b/erts/emulator/drivers/common/erl_efile.h
@@ -67,7 +67,7 @@
 #define FILENAMES_16BIT 1
 #endif
 
-// We use sendfilev if it exist on solaris
+/* We use sendfilev if it exist on solaris */
 #if !defined(HAVE_SENDFILE) && defined(HAVE_SENDFILEV)
 #define HAVE_SENDFILE
 #endif
@@ -88,20 +88,6 @@ typedef struct _Efile_error {
 } Efile_error;
 
 /*
- * This structure contains date and time.
- */
-
-//typedef struct _Efile_time {
-//    unsigned year;		/* (4 digits). */
-//    unsigned month;		/* (1..12). */
-//    unsigned day;		/* (1..31). */
-//    unsigned hour;		/* (0..23). */
-//    unsigned minute;		/* (0..59). */
-//    unsigned second;		/* (0..59). */
-//} Efile_time;
-
-
-/*
  * Describes what is returned by file:file_info/1.
  */
 
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index fb128fff7d..2451f41a82 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -3854,8 +3854,10 @@ static void desc_close(inet_descriptor* desc)
 	desc->forced_events = 0;
 	desc->send_would_block = 0;
 #endif
-	// We should close the fd here, but the other driver might still
-	// be selecting on it.
+	/*
+	 * We should close the fd here, but the other driver might still
+	 * be selecting on it.
+	 */
 	if (!desc->is_ignored)
 	    driver_select(desc->port,(ErlDrvEvent)(long)desc->event, 
 			  ERL_DRV_USE, 0);
diff --git a/erts/emulator/drivers/common/zlib_drv.c b/erts/emulator/drivers/common/zlib_drv.c
index 60394b610b..89b7be14f2 100644
--- a/erts/emulator/drivers/common/zlib_drv.c
+++ b/erts/emulator/drivers/common/zlib_drv.c
@@ -119,7 +119,7 @@ static int zlib_deflate(ZLibData* d, int flush);
 #if defined(__WIN32__)
 static int i32(char* buf)
 #else
-static inline int i32(char* buf)
+static __inline__ int i32(char* buf)
 #endif
 {
     return (int) (