X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Farchitecture.h;h=f1fef23cf281af782a694a6668941c0004bc7541;hb=f0e62e89970b8c38eb07a9beebd277ce13a5fcc2;hp=58e97e5744b44e63bf3c1f057f90bdcca3bc79e4;hpb=4f4b92ba7ae9c56cb0f181d5f95d709e085b8bd5;p=elogind.git diff --git a/src/shared/architecture.h b/src/shared/architecture.h index 58e97e574..f1fef23cf 100644 --- a/src/shared/architecture.h +++ b/src/shared/architecture.h @@ -21,14 +21,16 @@ along with systemd; If not, see . ***/ +#include + #include "util.h" /* A cleaned up architecture definition. We don't want to get lost in * processor features, models, generations or even ABIs. Hence we * focus on general family, and distuignish word width and - * endianess. */ + * endianness. */ -typedef enum Architecture { +enum { ARCHITECTURE_X86 = 0, ARCHITECTURE_X86_64, ARCHITECTURE_PPC, @@ -58,9 +60,9 @@ typedef enum Architecture { ARCHITECTURE_CRIS, _ARCHITECTURE_MAX, _ARCHITECTURE_INVALID = -1 -} Architecture; +}; -Architecture uname_architecture(void); +int uname_architecture(void); /* * LIB_ARCH_TUPLE should resolve to the local library path @@ -85,7 +87,7 @@ Architecture uname_architecture(void); # define LIB_ARCH_TUPLE "ppc64-linux-gnu" # else # define native_architecture() ARCHITECTURE_PPC64_LE -# error "Missing LIB_ARCH_TUPLE for PPC64LE" +# define LIB_ARCH_TUPLE "powerpc64le-linux-gnu" # endif #elif defined(__powerpc__) # if __BYTE_ORDER == __BIG_ENDIAN @@ -186,5 +188,5 @@ Architecture uname_architecture(void); #error "Please register your architecture here!" #endif -const char *architecture_to_string(Architecture a) _const_; -Architecture architecture_from_string(const char *s) _pure_; +const char *architecture_to_string(int a) _const_; +int architecture_from_string(const char *s) _pure_;