[hipl-commit] [trunk] Rev 4068: Remove stdint.h replacement header i3/utils/fwint.h.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Mon, 29 Mar 2010 19:50:06 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 29/03/2010 at 19:50:06
Revision: 4068
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Remove stdint.h replacement header i3/utils/fwint.h.
stdint.h is standard and widely available on all major platforms.
Modified:
D i3/utils/fwint.h
M i3/i3/i3.h
M i3/i3/i3_ping.h
M i3/i3_client/coordinates.h
M i3/i3_client/i3server_list.h
M i3/i3_client/qsort.h
M i3/utils/byteorder.c
M i3/utils/byteorder.h
M i3/utils/event.c
M i3/utils/event.h
M i3/utils/gen_utils.c
M i3/utils/gen_utils.h
M i3/utils/inetfns.h
M i3/utils/netwrap_win32.c
=== modified file 'i3/i3/i3.h'
--- i3/i3/i3.h 2010-02-17 17:38:08 +0000
+++ i3/i3/i3.h 2010-03-29 16:47:25 +0000
@@ -8,13 +8,10 @@
#ifndef I3_H
#define I3_H
+#include <stdint.h>
#include <sys/types.h>
-#ifdef _WIN32
- #include "../utils/fwint.h"
-#endif
#include "../utils/netwrap.h"
#ifdef __APPLE__
-#include <inttypes.h> // Need uint8_t
#include <sys/time.h> // Need timeval
#endif
#include <assert.h>
=== modified file 'i3/i3/i3_ping.h'
--- i3/i3/i3_ping.h 2010-02-17 17:38:08 +0000
+++ i3/i3/i3_ping.h 2010-03-29 16:47:25 +0000
@@ -2,11 +2,10 @@
#define _I3_PING_H
#include "../utils/netwrap.h"
+#include <stdint.h>
#if !defined(_WIN32)
- #include <inttypes.h>
#include <netinet/in.h>
#else
- #include "fwint.h"
#include <Winsock2.h>
#endif
=== modified file 'i3/i3_client/coordinates.h'
--- i3/i3_client/coordinates.h 2010-02-17 17:38:08 +0000
+++ i3/i3_client/coordinates.h 2010-03-29 16:47:25 +0000
@@ -1,11 +1,7 @@
#ifndef _COORDINATES_H
#define _COORDINATES_H
-#if !defined(_WIN32) || defined(__CYGWIN__)
- #include <inttypes.h>
-#else
- #include "../utils/fwint.h"
-#endif
+#include <stdint.h>
#define COORD_UNDEFINED 1000
=== modified file 'i3/i3_client/i3server_list.h'
--- i3/i3_client/i3server_list.h 2010-02-17 17:38:08 +0000
+++ i3/i3_client/i3server_list.h 2010-03-29 16:47:25 +0000
@@ -1,11 +1,7 @@
#ifndef _HOST_LIST_H
#define _HOST_LIST_H
-#if !defined(_WIN32)
- #include <inttypes.h>
-#else
- #include "../utils/fwint.h"
-#endif
+#include <stdint.h>
#include "../i3/i3.h"
#include "coordinates.h"
=== modified file 'i3/i3_client/qsort.h'
--- i3/i3_client/qsort.h 2010-02-01 13:24:34 +0000
+++ i3/i3_client/qsort.h 2010-03-29 16:47:25 +0000
@@ -1,11 +1,7 @@
#ifndef _QSORT_H
#define _QSORT_H
-#if !defined(_WIN32)
- #include <inttypes.h>
-#else
- #include "../utils/fwint.h"
-#endif
+#include <stdint.h>
void qksort(uint64_t *A, int ilo, int ihi);
=== modified file 'i3/utils/byteorder.c'
--- i3/utils/byteorder.c 2010-02-17 17:38:08 +0000
+++ i3/utils/byteorder.c 2010-03-29 16:47:25 +0000
@@ -1,8 +1,8 @@
+#include <stdint.h>
#include <sys/types.h>
#ifndef _WIN32
#include <netinet/in.h>
#else
- #include "fwint.h"
#include <Winsock2.h>
#endif
=== modified file 'i3/utils/byteorder.h'
--- i3/utils/byteorder.h 2010-02-17 17:38:08 +0000
+++ i3/utils/byteorder.h 2010-03-29 16:47:25 +0000
@@ -1,13 +1,8 @@
#ifndef _BYTE_ORDER_H
#define _BYTE_ORDER_H
+#include <stdint.h>
#include <sys/types.h>
-/* stg: under cygwin, _WIN32 can be defined if win32api header files get
included */
-#if defined(_WIN32)
- #include "fwint.h"
-#else
- #include <inttypes.h>
-#endif
/***************************************************************************
* Purpose: Wrapper functions for byte order conversion
=== modified file 'i3/utils/event.c'
--- i3/utils/event.c 2010-02-17 17:38:08 +0000
+++ i3/utils/event.c 2010-03-29 16:47:25 +0000
@@ -23,14 +23,9 @@
*
*/
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#ifndef _WIN32
- #include <inttypes.h>
-#else
- #include "fwint.h"
-#endif
-
#include "event.h"
=== modified file 'i3/utils/event.h'
--- i3/utils/event.h 2010-02-17 17:38:08 +0000
+++ i3/utils/event.h 2010-03-29 16:47:25 +0000
@@ -26,12 +26,7 @@
#ifndef INCL_EVENTS
#define INCL_EVENTS
-/* stg: under cygwin, _WIN32 can be defined if win32api header files get
included */
-#if defined(_WIN32)
- #include "fwint.h"
-#else
- #include <inttypes.h>
-#endif
+#include <stdint.h>
typedef struct _event {
uint64_t time;
=== modified file 'i3/utils/gen_utils.c'
--- i3/utils/gen_utils.c 2010-02-17 17:38:08 +0000
+++ i3/utils/gen_utils.c 2010-03-29 16:47:25 +0000
@@ -1,4 +1,5 @@
#include "gen_utils.h"
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -6,9 +7,7 @@
#include <assert.h>
#ifndef _WIN32
#include <sys/time.h>
- #include <inttypes.h>
#else
- #include "fwint.h"
#include <sys/types.h> // _ftime()
#include <sys/timeb.h> // _ftime()
#include <Windows.h> // struct timeval
=== modified file 'i3/utils/gen_utils.h'
--- i3/utils/gen_utils.h 2010-02-17 17:38:08 +0000
+++ i3/utils/gen_utils.h 2010-03-29 16:47:25 +0000
@@ -1,12 +1,11 @@
#ifndef _GEN_UTILS_H
#define _GEN_UTILS_H
+#include <stdint.h>
/* stg: under cygwin, _WIN32 can be defined if win32api header files get
included */
#if defined(_WIN32)
- #include "fwint.h" // Need uint8_t
#include <Winsock2.h> // struct timeval
#else
- #include <inttypes.h>
#include <sys/time.h> // struct timeval
#endif
=== modified file 'i3/utils/inetfns.h'
--- i3/utils/inetfns.h 2010-02-17 17:38:08 +0000
+++ i3/utils/inetfns.h 2010-03-29 16:47:25 +0000
@@ -1,13 +1,6 @@
#ifndef _INET_FNS_H
#define _INET_FNS_H
-/* stg: under cygwin, _WIN32 can be defined if win32api header files get
included */
-#if defined(_WIN32)
- #include "fwint.h"
-#else
- #include <inttypes.h>
-#endif
-
/* Get address of local machine */
uint32_t get_local_addr_eth(void);
uint32_t name_to_addr(const char *);
=== modified file 'i3/utils/netwrap_win32.c'
--- i3/utils/netwrap_win32.c 2010-02-17 17:38:08 +0000
+++ i3/utils/netwrap_win32.c 2010-03-29 16:47:25 +0000
@@ -1,7 +1,7 @@
-#include "netwrap.h"
+#include <stdint.h>
#include <string.h>
-#include "fwint.h"
#include <errno.h>
+#include "netwrap.h"
int inet_pton(const int af,
const char *src,
Other related posts:
- » [hipl-commit] [trunk] Rev 4068: Remove stdint.h replacement header i3/utils/fwint.h. - Diego Biurrun
