[haiku-commits] haiku: hrev45097 - src/libs/glut headers/posix/sys
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 28 Dec 2012 18:37:06 +0100 (CET)
hrev45097 adds 1 changeset to branch 'master'
old head: d917edcecd419a5c47183dea8ddd45f113532616
new head: 00e7904406d61e17409e0d646c9a461102c19940
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=00e7904+%5Ed917edc
----------------------------------------------------------------------------
00e7904: include string.h for FD_ZERO in sys/select.h
* sys/select.h was not self contained before, this fixes #9327
* index is defined as a function in string.h, fixed resulting name
collision in glut_shapes.c
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45097
Commit: 00e7904406d61e17409e0d646c9a461102c19940
URL: http://cgit.haiku-os.org/haiku/commit/?id=00e7904
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Fri Dec 28 17:30:03 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/9327
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 2 deletions(-)
headers/posix/sys/select.h | 3 +++
src/libs/glut/glut_shapes.c | 4 ++--
----------------------------------------------------------------------------
diff --git a/headers/posix/sys/select.h b/headers/posix/sys/select.h
index ebc9d0e..064a0dd 100644
--- a/headers/posix/sys/select.h
+++ b/headers/posix/sys/select.h
@@ -43,6 +43,9 @@ typedef struct fd_set {
#define _FD_BITSINDEX(fd) ((fd) / NFDBITS)
#define _FD_BIT(fd) (1L << ((fd) % NFDBITS))
+// FD_ZERO uses memset
+#include <string.h>
+
#define FD_ZERO(set) memset((set), 0, sizeof(fd_set))
#define FD_SET(fd, set) ((set)->bits[_FD_BITSINDEX(fd)] |= _FD_BIT(fd))
#define FD_CLR(fd, set) ((set)->bits[_FD_BITSINDEX(fd)] &= ~_FD_BIT(fd))
diff --git a/src/libs/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c
index 1f9d849..5912f52 100644
--- a/src/libs/glut/glut_shapes.c
+++ b/src/libs/glut/glut_shapes.c
@@ -507,7 +507,7 @@ static GLfloat idata[12][3] =
{-Z, -X, 0}
};
-static int index[20][3] =
+static int iIndex[20][3] =
{
{0, 4, 1},
{0, 9, 4},
@@ -537,7 +537,7 @@ icosahedron(GLenum shadeType)
int i;
for (i = 19; i >= 0; i--) {
- drawtriangle(i, idata, index, shadeType);
+ drawtriangle(i, idata, iIndex, shadeType);
}
}
Other related posts:
- » [haiku-commits] haiku: hrev45097 - src/libs/glut headers/posix/sys - korli
