author Gaia Pushbot <release+gaiajson@mozilla.com>
Mon, 20 Jan 2014 01:21:02 -0800
changeset 175887 efe19b2b2de7660ff926c3868aeffdbf73a0f994
parent 162447 0a62484ff46bb8ed6d3bb173ab04bc46c62b659b
child 188517 8d8165293e9b34761a1517f7904488742d47dcd8
permissions -rw-r--r--
Bumping gaia.json for 1 gaia-1_3 revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-1_3/rev/0cdba2aa2f39 Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com> Desc: Merge pull request #15117 from jaoo/945150 Bug 945150 - [DSDS] SIM manager(when PIN locked or no SIM), Call Settings, Message Settings and Cellular & Data are still accessible when airplane mode is on. r=arthurcc(cherry picked from commit cc28d9cf5214cbefb67171551ce2c367f7f80a7f) Conflicts: apps/settings/js/connectivity.js

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

/* Global defines needed by xpcom clients */

#ifndef _XPCOM_CONFIG_H_
#define _XPCOM_CONFIG_H_

/* Define this to throw() if the compiler complains about 
 * constructors returning NULL

/* Define if the c++ compiler can resolve ambiguity with |using| */

/* Define if a dyanmic_cast to void* gives the most derived object */

/* Define if the c++ compiler has trouble comparing a constant
 * reference to a templatized class to zero

/* Define if the c++ compiler requires implementations of 
 * unused virtual methods

/* Define to either __attribute__((malloc)) or nothing */

/* Define to either __attribute__((warn_unused_result)) or nothing */

#endif /* _XPCOM_CONFIG_H_ */