diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-13 18:38:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-13 18:38:30 +0000 |
| commit | d49eeebb3db74cfb2d68a6989c14f1c9961357b7 (patch) | |
| tree | e785f2e30401d67ef797f7a4fa6988dedf75f3c1 /mdk-stage1/probing.c | |
| parent | c990f18b155433c4069e1210cfb48d1b3c033ffb (diff) | |
| download | drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.gz drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.bz2 drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.xz drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.zip | |
(memdup) rename as _memdup() in order to prevent a symbol clash with libkmod
Diffstat (limited to 'mdk-stage1/probing.c')
| -rw-r--r-- | mdk-stage1/probing.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 0db75ffbd..6b969300b 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -872,7 +872,7 @@ void find_media(enum media_bus bus) tmp[count].name = NULL; count++; - medias = memdup(tmp, sizeof(struct media_info) * count); + medias = _memdup(tmp, sizeof(struct media_info) * count); } @@ -899,8 +899,8 @@ void get_medias(enum media_type media, char *** names, char *** models, enum med tmp_names[count] = NULL; tmp_models[count++] = NULL; - *names = memdup(tmp_names, sizeof(char *) * count); - *models = memdup(tmp_models, sizeof(char *) * count); + *names = _memdup(tmp_names, sizeof(char *) * count); + *models = _memdup(tmp_models, sizeof(char *) * count); } @@ -966,7 +966,7 @@ char ** get_net_devices(void) tmp[i++] = NULL; - return memdup(tmp, sizeof(char *) * i); + return _memdup(tmp, sizeof(char *) * i); } #endif /* DISABLE_NETWORK */ |