diff options
| author | Michael Brown | 2008-11-19 01:18:32 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:12:53 +0100 |
| commit | dc60c2414658f27b88f212bba8a36180ab8657fb (patch) | |
| tree | d4ad6d883d3fe6d4f7dfb9f75786f2815537d7dd /src/include | |
| parent | [pxe] Move all PXE files to arch/i386 (diff) | |
| download | ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.tar.gz ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.tar.xz ipxe-dc60c2414658f27b88f212bba8a36180ab8657fb.zip | |
[i386] Rename __cdecl to __asmcall
__cdecl is a misleading name, since it currently encapsulates both
cdecl and regparm(0) attributes. Rename to __asmcall.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/compiler.h | 5 | ||||
| -rw-r--r-- | src/include/stdlib.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/include/compiler.h b/src/include/compiler.h index b6a6f8e2c..4140a3563 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h @@ -302,9 +302,6 @@ int __debug_disable; /** Declare a variable or data structure as unused. */ #define __unused __attribute__ (( unused )) -/** Apply standard C calling conventions */ -#define __cdecl __attribute__ (( cdecl , regparm(0) )) - /** * Declare a function as pure - i.e. without side effects */ @@ -372,4 +369,6 @@ int __debug_disable; #endif /* ASSEMBLY */ +#include <bits/compiler.h> + #endif /* COMPILER_H */ diff --git a/src/include/stdlib.h b/src/include/stdlib.h index f3dc7e411..838a22acf 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -68,6 +68,6 @@ static inline void srand ( unsigned int seed ) { */ extern int system ( const char *command ); -extern __cdecl int main ( void ); +extern __asmcall int main ( void ); #endif /* STDLIB_H */ |