Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r64887:3ed53260e74c
Date: 2013-06-14 18:03 +0300
http://bitbucket.org/pypy/pypy/changeset/3ed53260e74c/
Log: merge heads
diff --git a/lib_pypy/_tkinter/tklib.py b/lib_pypy/_tkinter/tklib.py
--- a/lib_pypy/_tkinter/tklib.py
+++ b/lib_pypy/_tkinter/tklib.py
@@ -31,13 +31,13 @@
char *bytes;
int length;
Tcl_ObjType *typePtr;
- union { /* The internal representation: */
- long longValue; /* - an long integer value. */
- double doubleValue; /* - a double-precision floating value. */
- struct { /* - internal rep as two pointers. */
- void *ptr1;
- void *ptr2;
- } twoPtrValue;
+ union { /* The internal representation: */
+ long longValue; /* - an long integer value. */
+ double doubleValue; /* - a double-precision floating value. */
+ struct { /* - internal rep as two pointers. */
+ void *ptr1;
+ void *ptr2;
+ } twoPtrValue;
} internalRep;
...;
} Tcl_Obj;
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
