diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-08-25 22:17:07 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2017-08-25 22:17:07 -0400 |
| commit | ef61b5ecb59e9b4e37e3e3c023c62d583c23eb16 (patch) | |
| tree | 45a798fbed0dc673304597b29e0b60174195ce79 /py/objproperty.h | |
| parent | 266be307770abe11c220eb493388807920914b7a (diff) | |
| parent | 1f78e7a43130acfa4bedf16c1007a1b0f37c75c3 (diff) | |
Initial merge of micropython v1.9.2 into circuitpython 2.0.0 (in development) master.
cpx build compiles and loads and works in repl; test suite not run yet
esp8266 not tested yet
Diffstat (limited to 'py/objproperty.h')
| -rw-r--r-- | py/objproperty.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objproperty.h b/py/objproperty.h index 1852e6b6e..f95c1083c 100644 --- a/py/objproperty.h +++ b/py/objproperty.h @@ -23,8 +23,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_PY_OBJPROPERTY_H__ -#define __MICROPY_INCLUDED_PY_OBJPROPERTY_H__ +#ifndef MICROPY_INCLUDED_PY_OBJPROPERTY_H +#define MICROPY_INCLUDED_PY_OBJPROPERTY_H #include "py/obj.h" @@ -37,4 +37,4 @@ typedef struct _mp_obj_property_t { #endif // MICROPY_PY_BUILTINS_PROPERTY -#endif // __MICROPY_INCLUDED_PY_OBJPROPERTY_H__ +#endif // MICROPY_INCLUDED_PY_OBJPROPERTY_H |