- Removed the TURBO socket mechanism - it was in fact just using a variable to cache a few arithmetic operations (premature optimization)

- Since the fifohead mess is gone, fixed leftover bad code structuring

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10599 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 0 insertions, 11 deletions

diff --git a/src/common/core.h b/src/common/core.h
index 7784a95bb..68325505a 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -4,8 +4,6 @@
 #ifndef	_CORE_H_
 #define	_CORE_H_
 
-//#define SQL_DEBUG //uncomment for debug_mysql_query instead of mysql_real_query
-	
 extern int arg_c;
 extern char **arg_v;
 
diff --git a/src/common/socket.h b/src/common/socket.h
index a7734963a..f1997defe 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -21,19 +21,10 @@
 
 
 // socket I/O macros
-#ifdef TURBO
-#define RFIFOVAR(fd) rbPtr ## fd
-#define WFIFOVAR(fd) wbPtr ## fd
-#define RFIFOHEAD(fd) uint8 *RFIFOVAR(fd) = session[fd]->rdata+session[fd]->rdata_pos
-#define WFIFOHEAD(fd, x) uint8 *WFIFOVAR(fd) = ( (fd) > 0 && session[fd] ? session[fd]->wdata+session[fd]->wdata_size : NULL )
-#define RFIFOP(fd,pos) ( &RFIFOVAR(fd) + (pos) )
-#define WFIFOP(fd,pos) ( &WFIFOVAR(fd) + (pos) )
-#else
 #define RFIFOHEAD(fd)
 #define WFIFOHEAD(fd, size) do{ if((fd) && session[fd]->wdata_size + (size) > session[fd]->max_wdata ) realloc_writefifo(fd, size); }while(0)
 #define RFIFOP(fd,pos) (session[fd]->rdata + session[fd]->rdata_pos + (pos))
 #define WFIFOP(fd,pos) (session[fd]->wdata + session[fd]->wdata_size + (pos))
-#endif
 
 #define RFIFOB(fd,pos) (*(uint8*)RFIFOP(fd,pos))
 #define WFIFOB(fd,pos) (*(uint8*)WFIFOP(fd,pos))