Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 81 → Rev 82

/shark/trunk/include/kernel/func.h
21,11 → 21,11
 
/**
------------
CVS : $Id: func.h,v 1.5 2003-03-13 13:36:27 pj Exp $
CVS : $Id: func.h,v 1.6 2003-03-17 09:18:55 pj Exp $
 
File: $File$
Revision: $Revision: 1.5 $
Last update: $Date: 2003-03-13 13:36:27 $
Revision: $Revision: 1.6 $
Last update: $Date: 2003-03-17 09:18:55 $
------------
 
Kernel functions:
228,7 → 228,7
- cond_timedwait
- internal_sem_wait
*/
extern __inline__ void kern_context_load(c)
extern __inline__ void kern_context_load(CONTEXT c)
{
ll_context_to(c);
kern_after_dispatch();
/shark/trunk/include/sys/types.h
21,11 → 21,11
 
/**
------------
CVS : $Id: types.h,v 1.2 2003-03-13 13:41:04 pj Exp $
CVS : $Id: types.h,v 1.3 2003-03-17 09:18:55 pj Exp $
 
File: $File$
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-13 13:41:04 $
Revision: $Revision: 1.3 $
Last update: $Date: 2003-03-17 09:18:55 $
------------
 
**/
56,11 → 56,6
#define __SYS_TYPES_H__
 
#include <features.h>
 
#ifdef __cplusplus
extern "C" {
#endif
 
#include <kernel/types.h>
#include <kernel/descr.h>
 
102,9 → 97,13
#undef __DJ_uid_t
#define __DJ_uid_t
 
__END_DECLS
 
// for sched_param
#include <sched.h>
 
__BEGIN_DECLS
 
typedef struct {
// This fields are specified by the posix standard, 13.4.1
int contentionscope;
155,10 → 154,6
 
#endif /* !_POSIX_SOURCE */
 
#ifdef __cplusplus
}
#endif
 
/* -- */
 
typedef __u_quad_t u_quad_t;
/shark/trunk/config/mk/gnu.mk
1,3 → 1,4
CPP = gcc
CC = gcc
AS = gcc
LD = ld
56,4 → 57,6
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -c $<
%.s : %.c
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $<
%.o : %.cpp
$(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $<
 
/shark/trunk/config/mk/linux.mk
1,3 → 1,4
CPP = gcc
CC = gcc
AS = gcc
LD = ld
47,4 → 48,5
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -c $<
%.s : %.c
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $<
 
%.o : %.cpp
$(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $<
/shark/trunk/config/lib.mk
24,10 → 24,10
$(RM) $(LIBRARYPATHNAME)
 
depend::
$(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.s)) > deps
$(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.cpp) $(OBJS:.o=.s)) > deps
 
deps:
$(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.s)) > deps
$(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.cpp) $(OBJS:.o=.s)) > deps
 
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),cleanall)