Merge branch 'conflict' into develop

This commit is contained in:
Saturneric 2018-02-18 11:42:44 +08:00
commit 8287d51451

View File

@ -108,7 +108,7 @@ int init_value(Node *p_node,const char *type,void * p_value){
} }
void rand_init(void){ void rand_init(void){
srand((unsigned)time(NULL)); srandom((unsigned)time(NULL));
} }
unsigned long long getId(void){ unsigned long long getId(void){