-<<<<<<< .mine
-/*
- * This is used in do_apc_status() to track the last connection state.
- * We do not want the read function spitting out an error every "step"
- * seconds (usually 10 secs).
- */
-static int apcConnStatus = 0;
-
-static struct sockaddr_in tcp_serv_addr; /* socket information */
-static char *net_errmsg = NULL; /* pointer to error message */
-static char net_errbuf[256]; /* error message buffer for messages */
-
-=======
->>>>>>> .r743
-/*
- * The following are normally compiled, when the module is compiled with its
- * own main for testing these are ifdef'd out.
- */