Partial-Merge commit '16637ac' into cg_merges_20121203

miner.h

@@ -551,7 +551,6 @@ extern void thr_info_cancel(struct thr_info *thr);
 extern void thr_info_freeze(struct thr_info *thr);
 extern void nmsleep(unsigned int msecs);
 extern double us_tdiff(struct timeval *end, struct timeval *start);
-extern void RenameThread(const char* name);
 extern double tdiff(struct timeval *end, struct timeval *start);
 
 struct string_elist {

util.h

@@ -53,5 +53,6 @@ bool auth_stratum(struct pool *pool);
 bool initiate_stratum(struct pool *pool);
 void dev_error(struct cgpu_info *dev, enum dev_reason reason);
 void *realloc_strcat(char *ptr, char *s);
+void RenameThread(const char* name);
 
 #endif /* __UTIL_H__ */