[netrek-cvs] client/netrekxp/include data.h, 1.117, 1.118 proto.h, 1.69, 1.70

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25648/include

Modified Files:
	data.h proto.h 
Log Message:
Remove CONTROL_KEY define, add comment about sensing if
control key is down in the keyboard handler function.
Remove RABBIT_EARS, USE_PORTSWAP, NEW_DASHBOARD_2,
these defines were unused.
Remove UDP_PORTSWAP define.  Fix bug in sendUdpReq() if portswap
was off with UDP_PORTSWAP defined.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- data.h	9 Jun 2009 00:28:10 -0000	1.117
+++ data.h	9 Jun 2009 01:04:33 -0000	1.118
@@ -569,11 +569,6 @@
 
 #endif
 
-#ifdef CONTROL_KEY
-extern int use_control_key;
-
-#endif
-
 #ifdef DOC_WIN
 extern W_Window docwin, xtrekrcwin;
 extern int maxdoclines, maxxtrekrclines;
@@ -655,9 +650,7 @@
 extern int F_dead_warp;
 #endif
 
-#ifdef UDP_PORTSWAP
 extern int portSwap;
-#endif
 
 // Load Ship Bitmaps from .BMP files
 extern char *fed_ship_bmp;

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- proto.h	8 Jun 2009 22:26:07 -0000	1.69
+++ proto.h	9 Jun 2009 01:04:33 -0000	1.70
@@ -1161,9 +1161,7 @@
 struct udp_reply_spacket;
 void handleUdpReply (struct udp_reply_spacket *packet);
 int openUdpConn (void);
-#ifdef UDP_PORTSWAP
 int connUdpConn ();
-#endif
 int recvUdpConn (void);
 int closeUdpConn (void);
 void printUdpInfo (void);