More windows fixes for 10.2 integration

mariadb-corporation · Feb 5, 2016 · f0b1561 · f0b1561
1 parent 26b56d9
commit f0b1561
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/include/my_sys.h b/include/my_sys.h
@@ -460,7 +460,7 @@ extern uint ma_dirname_length(const char *name);
 extern int test_if_hard_path(const char *dir_name);
 extern char *ma_convert_dirname(my_string name);
 extern void to_unix_path(my_string name);
-extern my_string fn_ext(const char *name);
+extern my_string ma_fn_ext(const char *name);
 extern my_string fn_same(my_string toname,const char *name,int flag);
 extern my_string ma_fn_format(my_string to,const char *name,const char *dsk,
 			   const char *form,int flag);

diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -303,7 +303,6 @@ my_messnc.c
 my_net.c
 my_once.c
 my_port.c 
-my_pthread.c
 my_seek.c
 my_static.c
 my_symlink.c
@@ -315,7 +314,6 @@ str2int.c
 string.c
 strtoll.c
 strtoull.c 
-thr_mutex.c
 typelib.c
 sha1.c
 my_stmt.c

diff --git a/libmariadb/default.c b/libmariadb/default.c
@@ -393,7 +393,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MA_MEM_ROOT *alloc,
 void ma_print_defaults(const char *conf_file, const char **groups)
 {
 #ifdef _WIN32
-  bool have_ext=fn_ext(conf_file)[0] != 0;
+  bool have_ext=ma_fn_ext(conf_file)[0] != 0;
 #endif
   char name[FN_REFLEN];
   const char **dirs;

diff --git a/libmariadb/longlong2str.c b/libmariadb/longlong2str.c
@@ -99,8 +99,8 @@ char *ma_longlong2str(longlong val,char *dst,int radix)
 
 #endif
 
-#ifndef longlong10_to_str
-char *longlong10_to_str(longlong val,char *dst,int radix)
+#ifndef ma_longlong10_to_str
+char *ma_longlong10_to_str(longlong val,char *dst,int radix)
 {
   char buffer[65];
   register char *p;

diff --git a/libmariadb/mf_fn_ext.c b/libmariadb/mf_fn_ext.c
@@ -26,10 +26,10 @@
 	   NULL of the filename
 	*/
 
-my_string fn_ext(const char *name)
+my_string ma_fn_ext(const char *name)
 {
   register my_string pos,gpos;
-  DBUG_ENTER("fn_ext");
+  DBUG_ENTER("ma_fn_ext");
   DBUG_PRINT("mfunkt",("name: '%s'",name));
 
 #if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR)
@@ -43,4 +43,4 @@ my_string fn_ext(const char *name)
 #endif
   pos=strrchr(gpos,FN_EXTCHAR);
   DBUG_RETURN (pos ? pos : strend(gpos));
-} /* fn_ext */
+} /* ma_fn_ext */
diff --git a/libmariadb/mf_path.c b/libmariadb/mf_path.c
@@ -91,7 +91,7 @@ static char *find_file_in_path(char *to, const char *name)
     return NullS;
   dir[0]=FN_LIBCHAR; dir[1]=0;
 #ifdef PROGRAM_EXTENSION
-  if (!fn_ext(name)[0])
+  if (!ma_fn_ext(name)[0])
     ext=PROGRAM_EXTENSION;
 #endif
 

diff --git a/libmariadb/my_pthread.c b/libmariadb/my_pthread.c
@@ -29,7 +29,7 @@
 #ifdef _WIN32
 
 int 
-pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
+ma_pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
 {
   DBUG_ENTER("pthread_cond_init");
   /* Initialize the count to 0 */
@@ -45,9 +45,9 @@ pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
   DBUG_RETURN(0);
 }
 
-int pthread_cond_timedwait(pthread_cond_t *cond, 
-	                       pthread_mutex_t *mutex,
-                           struct timespec *abstime)
+int ma_pthread_cond_timedwait(pthread_cond_t *cond, 
+                              pthread_mutex_t *mutex,
+                              struct timespec *abstime)
 {
   int result= 0;
   return result == WAIT_TIMEOUT ? ETIMEDOUT : 0;

diff --git a/libmariadb/my_stmt_codec.c b/libmariadb/my_stmt_codec.c
@@ -363,7 +363,7 @@ static void convert_from_long(MYSQL_BIND *r_param, const MYSQL_FIELD *field, lon
       char *endptr;
       uint len;
 
-      endptr= longlong10_to_str(val, buffer, is_unsigned ? 10 : -10);
+      endptr= ma_longlong10_to_str(val, buffer, is_unsigned ? 10 : -10);
       len= (uint)(endptr - buffer);
 
       /* check if field flag is zerofill */