Bug 1073003 - Fix warnings about macro redefinitions by changing macros to constants. r=ehsan

--HG--
extra : rebase_source : 6ddd2bf8892e6ff87df19c4d48a2341418436371
extra : source : 63994e7cc7aa9d437ffc775462d9aa0e0fadb8b6
This commit is contained in:
Botond Ballo 2014-12-17 16:47:49 -05:00
Родитель 5a8c6cf169
Коммит 213f98cbb5
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -13,7 +13,7 @@ using namespace mozilla::dom;
#define BUFFER_SIZE 4096 #define BUFFER_SIZE 4096
#define COMMAND_SIZE 256 #define COMMAND_SIZE 256
#define PROPERTY_VALUE_MAX 80 const uint32_t kPropertyValueMax = 80;
// Intentionally not trying to dlclose() this handle. That's playing // Intentionally not trying to dlclose() this handle. That's playing
// Russian roulette with security bugs. // Russian roulette with security bugs.
@ -38,7 +38,7 @@ GetSharedLibrary()
static bool static bool
GetWifiP2pSupported() GetWifiP2pSupported()
{ {
char propP2pSupported[PROPERTY_VALUE_MAX]; char propP2pSupported[kPropertyValueMax];
property_get("ro.moz.wifi.p2p_supported", propP2pSupported, "0"); property_get("ro.moz.wifi.p2p_supported", propP2pSupported, "0");
return (0 == strcmp(propP2pSupported, "1")); return (0 == strcmp(propP2pSupported, "1"));
} }
@ -379,7 +379,7 @@ public:
// Concrete class to use to access the wpa supplicant. // Concrete class to use to access the wpa supplicant.
WpaSupplicant::WpaSupplicant() WpaSupplicant::WpaSupplicant()
{ {
char propVersion[PROPERTY_VALUE_MAX]; char propVersion[kPropertyValueMax];
property_get("ro.build.version.sdk", propVersion, "0"); property_get("ro.build.version.sdk", propVersion, "0");
mSdkVersion = strtol(propVersion, nullptr, 10); mSdkVersion = strtol(propVersion, nullptr, 10);