Merge branch 'master' into maverick

- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx

asynnet.c

@@ -45,7 +45,8 @@
 #define MAXCONNECTIONS   1024
 #define RBUFFERSIZE       262144 /* 256kb */
 #define WBUFFERSIZE       20*262144
-/* #define WBUFFERSIZE       100*262144 /*
+/* #define WBUFFERSIZE       100*262144 */
+#define MAXWBUFFERSIZE 128*1000*1024
 /*--------------------------------------------------------------------------*/
 typedef struct {
   int socket;
@@ -204,7 +205,7 @@ int ANETregisterSocket(int socket)
   flags =1;
   setsockopt(socket,IPPROTO_TCP,TCP_NODELAY,(char *) &flags, sizeof(int));
   socke.readBuffer = MakeRWPuffer(RBUFFERSIZE);
-  socke.writeBuffer = MakeRWPuffer(WBUFFERSIZE);
+  socke.writeBuffer = MakeBigRWPuffer(WBUFFERSIZE, MAXWBUFFERSIZE);
   if (socke.readBuffer == NULL || socke.writeBuffer == NULL) {
     return ANETMEM;
   }
@@ -247,6 +248,7 @@ int ANETconnect(char *name, int iPort)
   status = connect(socke, (struct sockaddr *) &addresse,
                    sizeof(struct sockaddr_in));
   if (status < 0) {
+    close(socke);
     anetLog(ANETERROR, "Failed to open socket to %s:%d", name, iPort);
     return ANETOPENFAIL;
   }
@@ -497,7 +499,20 @@ int ANETinfo(int handle, char *hostname, int hostnameLen)
   }
   return 1;
 }
+/*---------------------------------------------------------------------------*/
+int ANETcanWrite(int handle, void *buffer, int count)
+{
+  pSocketDescriptor con = NULL;
+  int status;
 
+  con = findSocketDescriptor(handle);
+  if (con == NULL) {
+    return ANETDISCONNECTED;
+  } else {
+    ANETprocess();
+    return CanStoreRWBuffer(con->writeBuffer, buffer, count);
+  }
+}
 /*---------------------------------------------------------------------------*/
 int ANETwrite(int handle, void *buffer, int count)
 {