Changeset 333

Timestamp:

05/02/08 17:28:48 (2 months ago)

Author:

hsattler

Message:

make apps compile on all supported windows compile environments

Files:

• trunk/apps/irobex_palm3.c (modified) (2 diffs)
• trunk/apps/irxfer.c (modified) (2 diffs)
• trunk/apps/obex_put_common.c (modified) (1 diff)
• trunk/apps/obex_tcp.c (modified) (2 diffs)
• trunk/apps/obex_test.c (modified) (2 diffs)
• trunk/apps/obex_test_client.c (modified) (2 diffs)
• trunk/apps/obex_test_server.c (modified) (1 diff)

trunk/apps/irobex_palm3.c

@@ -31 +31 @@
-#endif
-
+#include <openobex/obex.h>
+#include "obex_put_common.h"
+#include "obex_io.h"
+
-#include <stdio.h>
-#include <stdlib.h>
@@ -38 +42 @@
-#include <string.h>
-#endif
-
-#include <openobex/obex.h>
-
-#include "obex_put_common.h"
-#include "obex_io.h"
-
-#define TRUE  1

trunk/apps/irxfer.c

@@ -32 +32 @@
-
-#include <openobex/obex.h>
+#include "obex_put_common.h"
+#include "obex_io.h"
-
-#ifdef _WIN32
@@ -41 +43 @@
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "obex_put_common.h"
-#include "obex_io.h"
-
-#define TRUE  1

trunk/apps/obex_put_common.c

@@ -24 +24 @@
-#endif
-
+#include <openobex/obex.h>
+
+#include "obex_put_common.h"
+#include "obex_io.h"
+
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <openobex/obex.h>
-
-#include "obex_put_common.h"
-#include "obex_io.h"
-
-#define TRUE  1

trunk/apps/obex_tcp.c

@@ -24 +24 @@
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <string.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
@@ -47 +42 @@
-#include "obex_put_common.h"
-#include "obex_io.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string.h>
-
-#define TRUE  1

trunk/apps/obex_test.c

@@ -24 +24 @@
-#endif
-
+#ifdef HAVE_BLUETOOTH
+#include "../lib/bluez_compat.h"
+#endif
+
+#include <openobex/obex.h>
+
+#include "obex_test.h"
+#include "obex_test_client.h"
+#include "obex_test_server.h"
+
+#ifndef _WIN32
+#include "obex_test_cable.h"
+
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif
+
-#include <stdio.h>
-#include <unistd.h>
@@ -29 +48 @@
-#include <string.h>
-
-
-
+
-#define in_addr_t unsigned long
-#else
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif /* _WIN32 */
-
-#ifdef HAVE_BLUETOOTH
-#include "../lib/bluez_compat.h"
-#endif
-
-#include <openobex/obex.h>
-
-#include "obex_test.h"
-#include "obex_test_client.h"
-#include "obex_test_server.h"
-
-#ifndef _WIN32
-#include "obex_test_cable.h"
-#endif
-

trunk/apps/obex_test_client.c

@@ -24 +24 @@
-#endif
-
-stdio
-
-<unistd.h>
-<fcntl.h>
-<string.h>
+openobex/obex
+
+"obex_io.h"
+"obex_test_client.h"
+"obex_test.h"
-
-#if defined(_WIN32)
@@ -43 +43 @@
-#endif
-
-openobex/obex
-
-"obex_io.h"
-"obex_test_client.h"
-"obex_test.h"
+stdio
+
+<unistd.h>
+<fcntl.h>
+<string.h>
-
-#define TRUE  1

trunk/apps/obex_test_server.c

@@ -24 +24 @@
-#endif
-
+#include <openobex/obex.h>
+
+#include "obex_io.h"
+#include "obex_test.h"
+#include "obex_test_server.h"
+
-#include <stdio.h>
-
-#include <openobex/obex.h>
-
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include "obex_io.h"
-#include "obex_test.h"
-#include "obex_test_server.h"
-
-#define TRUE  1