Skip to content

Commit eb4a89d

Browse files
committed
sqUnixDragDrop.c needs sqAssert.h. ollow Ronie's lead in dealing with sched.h's
definition of clone., which conflicts with the interpreter's.
1 parent 54673c8 commit eb4a89d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
*/
3838

3939
#include "sq.h"
40+
#include "sqAssert.h"
4041
#include "sqVirtualMachine.h"
4142
#include "FilePlugin.h"
4243
#include "DropPlugin.h"

platforms/unix/vm/sqUnixVMProfile.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ ioClearProfile(void)
4343
{
4444
}
4545
#else /* NO_VM_PROFILE */
46-
#include <pthread.h>
46+
/* linux's sched.h defines clone that conflicts with the interpreter's */
47+
# define clone NameSpacePollutant
48+
# include <pthread.h>
49+
# undef clone
4750
#include "include_ucontext.h"
4851
#include <signal.h>
4952
#include <sys/time.h>
@@ -57,7 +60,9 @@ extern unsigned long _etext;
5760

5861
#include <errno.h>
5962

63+
#define clone(foo) fubar(foo) // sched.h declares clone
6064
#include "sq.h"
65+
#undef clone
6166

6267
/*
6368
* The pc collection scheme is an event buffer into which are written pcs. The

0 commit comments

Comments
 (0)