From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 27 May 2011 21:56:36 +0000 (+0200)
Subject: C compilers are compliant enough that stdint.h can be used for integer types now.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/d7e0c2117f57b060550c5cb7bef08ab3dd4e0094

C compilers are compliant enough that stdint.h can be used for integer types now.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---

diff --git a/arch/m68k/generic/defines/types.h b/arch/m68k/generic/defines/types.h
index e2d8c7b..8049f02 100644
--- a/arch/m68k/generic/defines/types.h
+++ b/arch/m68k/generic/defines/types.h
@@ -1,63 +1 @@
-#ifndef _M68K_TYPES_H
-#define _M68K_TYPES_H
-
-typedef unsigned short umode_t;
-
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-
-typedef __u8  uint8_t;
-typedef __s8  int8_t;
-typedef __u16 uint16_t;
-typedef __s16 int16_t;
-typedef __u32 uint32_t;
-typedef __s32 int32_t;
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __s64 int64_t;
-typedef __u64 uint64_t;
-#endif
-
-#endif /* !(__BIT_TYPES_DEFINED__) */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-typedef signed char s8;
-typedef unsigned char u8;
-
-typedef signed short s16;
-typedef unsigned short u16;
-
-typedef signed int s32;
-typedef unsigned int u32;
-
-typedef signed long long s64;
-typedef unsigned long long u64;
-
-#define BITS_PER_LONG 32
-
-#endif /* __KERNEL__ */
-
-#endif /* _M68K_TYPES_H */
+#include <inttypes.h>
diff --git a/libs4c/cmdproc/cmd_io.c b/libs4c/cmdproc/cmd_io.c
index 39c02cb..fe9f7ce 100644
--- a/libs4c/cmdproc/cmd_io.c
+++ b/libs4c/cmdproc/cmd_io.c
@@ -1,6 +1,6 @@
 #include <cmd_proc.h>
 #include <string.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 /** 
  * Blocking call to print a string.
diff --git a/libs4c/cmdproc/cmd_proc.c b/libs4c/cmdproc/cmd_proc.c
index 86cfbe2..c6de7e9 100644
--- a/libs4c/cmdproc/cmd_proc.c
+++ b/libs4c/cmdproc/cmd_proc.c
@@ -18,7 +18,7 @@
    - other license provided by project originators
  *******************************************************************/
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/libs4c/misc/utils.c b/libs4c/misc/utils.c
index 07e452d..f27c35c 100644
--- a/libs4c/misc/utils.c
+++ b/libs4c/misc/utils.c
@@ -9,7 +9,7 @@
 
  *******************************************************************/
 
-#include <inttypes.h>
+#include <stdint.h>
 //#include <system_def.h>
 #include <string.h>
 #include <stdio.h>