diff options
author | Christian Heimes <christian@cheimes.de> | 2008-10-02 19:56:01 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-10-02 19:56:01 (GMT) |
commit | 1a8501c64837368a6973ff3f9850b652888c281a (patch) | |
tree | 0884a11d8b60a9d6db6262ab91b5e70e00934368 /Modules | |
parent | c472532c0cd056a23f4d50bd9a03d0fdea856a0a (diff) | |
download | cpython-1a8501c64837368a6973ff3f9850b652888c281a.zip cpython-1a8501c64837368a6973ff3f9850b652888c281a.tar.gz cpython-1a8501c64837368a6973ff3f9850b652888c281a.tar.bz2 |
Merged revisions 66748 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66748 | christian.heimes | 2008-10-02 21:47:50 +0200 (Thu, 02 Oct 2008) | 1 line
Fixed a couple more C99 comments and one occurence of inline.
........
+ another // comment in bytesobject
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_ctypes/libffi/src/x86/ffi.c | 4 | ||||
-rw-r--r-- | Modules/signalmodule.c | 2 | ||||
-rw-r--r-- | Modules/tkappinit.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_ctypes/libffi/src/x86/ffi.c b/Modules/_ctypes/libffi/src/x86/ffi.c index 767effb..60d7f47 100644 --- a/Modules/_ctypes/libffi/src/x86/ffi.c +++ b/Modules/_ctypes/libffi/src/x86/ffi.c @@ -388,10 +388,10 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure, return FFI_BAD_ABI; } - // we currently don't support certain kinds of arguments for raw + /* we currently don't support certain kinds of arguments for raw // closures. This should be implemented by a separate assembly language // routine, since it would require argument processing, something we - // don't do now for performance. + // don't do now for performance. */ for (i = cif->nargs-1; i >= 0; i--) { diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 8860b39..7464eae 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -107,7 +107,7 @@ timeval_from_double(double d, struct timeval *tv) tv->tv_usec = fmod(d, 1.0) * 1000000.0; } -static inline double +Py_LOCAL_INLINE(double) double_from_timeval(struct timeval *tv) { return tv->tv_sec + (double)(tv->tv_usec / 1000000.0); diff --git a/Modules/tkappinit.c b/Modules/tkappinit.c index 1c67632..de04b0d 100644 --- a/Modules/tkappinit.c +++ b/Modules/tkappinit.c @@ -71,7 +71,7 @@ Tcl_AppInit(Tcl_Interp *interp) #endif #ifdef WITH_XXX - // Initialize modules that don't require Tk + /* Initialize modules that don't require Tk */ #endif _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY); |