commit 59ab0c534095afdab0765240a6eaeaad2ab43ab0
author Mike Lockwood <lockwood@android.com> Mon Apr 12 09:57:11 2010 -0400
committer Mike Lockwood <lockwood@android.com> Mon Apr 12 09:59:40 2010 -0400
tree 15e5171518e19cef4bb5839bcb1a6d4afcccdfa9
parent 35c8cba41779657a0ec84f9380d9a2cff2a5f7f5

Revert "Make adb's daemon-port on the host machine configurable."

Fix the build.
This reverts commit 5a00fd1c5542b302e5534d7c424ee92da3d6bceb.

adb/adb.h

diff --git a/adb/adb.h b/adb/adb.h
index a2b611e..aaf8a28 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -237,8 +237,8 @@
 void send_packet(apacket *p, atransport *t);
 
 void get_my_path(char *s, size_t maxLen);
-int launch_server(int server_port);
-int adb_main(int is_daemon, int server_port);
+int launch_server();
+int adb_main(int is_daemon);
 
 
 /* transports are ref-counted
@@ -358,8 +358,8 @@
 #define print_packet(tag,p) do {} while (0)
 #endif
 
-#define DEFAULT_ADB_PORT 5037
-#define DEFAULT_ADB_LOCAL_TRANSPORT_PORT 5555
+#define ADB_PORT 5037
+#define ADB_LOCAL_TRANSPORT_PORT 5555
 
 #define ADB_CLASS              0xff
 #define ADB_SUBCLASS           0x42