Project

General

Profile

Actions
Copy link

Bug #2735

closed

lighttpd 1.4.40 compilation fails on illumos (OpenIndiana)

Added by alp almost 8 years ago. Updated almost 8 years ago.

Status:
Fixed
Priority:
Normal
Category:
core
Target version:
1.4.41
ASK QUESTIONS IN Forums:

Description

Compilation fails, because FIONREAD is not defined. Attached patch fixes the issue.

Files

09-fileio.h.patch (1.2 KB) 09-fileio.h.patch alp, 2016-07-18 07:47
Actions
Copy link
 #1

Updated by gstrauss almost 8 years ago

  • Category set to core
  • Status changed from New to Patch Pending
  • Target version changed from 1.4.x to 1.4.41

Sorry about that, and thanks for the patch. I hadn't found any modern references to filio.h on the internets and removed it in development some months ago. It will be added back in the next version of lighttpd.

Actions
Copy link
 #2

Updated by gstrauss almost 8 years ago

I'll add it in the header which contains #include <sys/ioctl.h>

diff --git a/src/sys-socket.h b/src/sys-socket.h
index 04c9d94..e3ca029 100644
--- a/src/sys-socket.h
+++ b/src/sys-socket.h
@@ -21,6 +21,11 @@
 #include <arpa/inet.h>

 #include <netdb.h>
+
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>  /* FIONREAD (for illumos (OpenIndiana)) */
+#endif
+
 #endif

 #endif
Actions
Copy link
 #3

Updated by gstrauss almost 8 years ago

  • Status changed from Patch Pending to Fixed

Fix committed to master

Revision a3ec906e

 
[core] #include <sys/filio.h> for FIONREAD (fixes #2735)

illumos (OpenIndiana) gets FIONREAD from <sys/filio.h>

Actions
Copy link

Also available in: Atom