X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Farchitecture.h;h=cb82418a5e4b62162aa28b9511133f1987a29c58;hp=353d49bedf02b314602bfdd4a21af63ae0dfef8b;hb=b6b1849830f5e4a6065c3b0c993668e500c954d3;hpb=06b643e7f5a3b79005dd57497897ab7255fe3659 diff --git a/src/shared/architecture.h b/src/shared/architecture.h index 353d49bed..cb82418a5 100644 --- a/src/shared/architecture.h +++ b/src/shared/architecture.h @@ -30,7 +30,7 @@ * focus on general family, and distuignish word width and * endianness. */ -typedef enum Architecture { +enum { ARCHITECTURE_X86 = 0, ARCHITECTURE_X86_64, ARCHITECTURE_PPC, @@ -60,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 @@ -133,7 +133,7 @@ Architecture uname_architecture(void); # else # define native_architecture() ARCHITECTURE_MIPS_LE # define LIB_ARCH_TUPLE "mipsel-linux-gnu" -#endif +# endif #elif defined(__alpha__) # define native_architecture() ARCHITECTURE_ALPHA # define LIB_ARCH_TUPLE "alpha-linux-gnu" @@ -185,8 +185,8 @@ Architecture uname_architecture(void); # define native_architecture() ARCHITECTURE_CRIS # error "Missing LIB_ARCH_TUPLE for CRIS" #else -#error "Please register your architecture here!" +# 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_;