← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_gethwaddr.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_gethwaddr.c
17
17
/* if there are many available, any non-zero one can be used */
18
18
 
19
19
#include "mysys_priv.h"
20
 
#include <m_string.h>
 
20
#include <mystrings/m_string.h>
21
21
 
22
22
#ifndef MAIN
23
23
 
73
73
  return res;
74
74
}
75
75
 
76
 
#elif __linux__
 
76
#elif defined(__linux__)
77
77
 
78
78
#include <net/if.h>
79
79
#include <sys/ioctl.h>
88
88
  if (fd < 0)
89
89
    goto err;
90
90
 
91
 
  bzero(&ifr, sizeof(ifr));
 
91
  memset(&ifr, 0, sizeof(ifr));
92
92
  strnmov(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
93
93
 
94
94
  do {