database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Backport of:

Browse Source 
----------------------------------------------------------------------
ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0
  Bug#32082 : definition of VOID in my_global.h conflicts with Windows
  SDK headers
  
  VOID macro is now removed. Its usage is replaced with void cast.
  In some cases, where cast does not make much sense (pthread_*, printf, 
  hash_delete, my_seek), cast is ommited.
This commit is contained in:
Konstantin Osipov
2009-11-24 16:54:59 +03:00
parent 26cd9abe4f
commit 4cff617c25
117 changed files with 835 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/udf_example.c
View File

@ -767,14 +767,14 @@ char *lookup(UDF_INIT *initid __attribute__((unused)), UDF_ARGS *args,
return 0;
}
#else
VOID(pthread_mutex_lock(&LOCK_hostname));
pthread_mutex_lock(&LOCK_hostname);
if (!(hostent= gethostbyname((char*) name_buff)))
{
VOID(pthread_mutex_unlock(&LOCK_hostname));
pthread_mutex_unlock(&LOCK_hostname);
*null_value= 1;
return 0;
}
VOID(pthread_mutex_unlock(&LOCK_hostname));
pthread_mutex_unlock(&LOCK_hostname);
#endif
memcpy_fixed((char*) &in,(char*) *hostent->h_addr_list, sizeof(in.s_addr));
*res_length= (ulong) (strmov(result, inet_ntoa(in)) - result);
@ -871,14 +871,14 @@ char *reverse_lookup(UDF_INIT *initid __attribute__((unused)), UDF_ARGS *args,
return 0;
}
#else
VOID(pthread_mutex_lock(&LOCK_hostname));
pthread_mutex_lock(&LOCK_hostname);
if (!(hp= gethostbyaddr((char*) &taddr, sizeof(taddr), AF_INET)))
{
VOID(pthread_mutex_unlock(&LOCK_hostname));
pthread_mutex_unlock(&LOCK_hostname);
*null_value= 1;
return 0;
}
VOID(pthread_mutex_unlock(&LOCK_hostname));
pthread_mutex_unlock(&LOCK_hostname);
#endif
*res_length=(ulong) (strmov(result,hp->h_name) - result);
return result;