--- old/src/solaris/transport/socket/socket_md.c 2012-03-08 15:28:27.237656968 +0800 +++ new/src/solaris/transport/socket/socket_md.c 2012-03-08 15:28:26.877656968 +0800 @@ -35,8 +35,7 @@ #include #ifdef __solaris__ #include -#endif -#ifdef __linux__ +#else #include #include #endif @@ -281,9 +280,8 @@ return r; } -#endif +#else -#ifdef __linux__ int dbgsysTlsAlloc() { pthread_key_t key;