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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index c62905acfb76b97944765398c8212d89060138bf..487297877ea3eb5f719dd64fdc06f9a9583492c5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,7 +12,7 @@ What's New in Python 2.6.1 alpha 1
 Core and Builtins
 -----------------
 
-- Fixed a broken comment in Objects/frameobject.c. Python is now C89 compatible
+- Fixed C99 style comments in several files. Python is now C89 compatible
   again.
 
 Library

diff --git a/Modules/_ctypes/libffi/src/x86/ffi.c b/Modules/_ctypes/libffi/src/x86/ffi.c
index 767effb8380a709c95ef69321eacdda4b5678c3f..60d7f470307f460a25b8954fe12b8bc492fb70f9 100644 (file)
--- 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 628780fe5e19c5a235c8498509c75ed73adba79e..d5d80c57eec75edee768021de034c020127f42ae 100644 (file)
--- 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 1c676325ecedee9dda40a5b10dddd45a4b676903..de04b0dfb6e48df47fcdd0fb91ff282fbc780daa 100644 (file)
--- 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);

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 524859c1116d6ba531d366cf3ae7b5c421774c90..f8601d87ffa90bcea9b5a6b9fdc86fa797c25d20 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -115,19 +115,19 @@ static char unicode_default_encoding[100];
 /* Fast detection of the most frequent whitespace characters */
 const unsigned char _Py_ascii_whitespace[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
-//     case 0x0009: /* HORIZONTAL TABULATION */
-//     case 0x000A: /* LINE FEED */
-//     case 0x000B: /* VERTICAL TABULATION */
-//     case 0x000C: /* FORM FEED */
-//     case 0x000D: /* CARRIAGE RETURN */
+/*     case 0x0009: * HORIZONTAL TABULATION */
+/*     case 0x000A: * LINE FEED */
+/*     case 0x000B: * VERTICAL TABULATION */
+/*     case 0x000C: * FORM FEED */
+/*     case 0x000D: * CARRIAGE RETURN */
        0, 1, 1, 1, 1, 1, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-//     case 0x001C: /* FILE SEPARATOR */
-//     case 0x001D: /* GROUP SEPARATOR */
-//     case 0x001E: /* RECORD SEPARATOR */
-//     case 0x001F: /* UNIT SEPARATOR */
+/*     case 0x001C: * FILE SEPARATOR */
+/*     case 0x001D: * GROUP SEPARATOR */
+/*     case 0x001E: * RECORD SEPARATOR */
+/*     case 0x001F: * UNIT SEPARATOR */
        0, 0, 0, 0, 1, 1, 1, 1,
-//     case 0x0020: /* SPACE */
+/*     case 0x0020: * SPACE */
        1, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -146,13 +146,13 @@ const unsigned char _Py_ascii_whitespace[] = {
 /* Same for linebreaks */
 static unsigned char ascii_linebreak[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
-//         0x000A, /* LINE FEED */
-//         0x000D, /* CARRIAGE RETURN */
+/*         0x000A, * LINE FEED */
+/*         0x000D, * CARRIAGE RETURN */
        0, 0, 1, 0, 0, 1, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-//         0x001C, /* FILE SEPARATOR */
-//         0x001D, /* GROUP SEPARATOR */
-//         0x001E, /* RECORD SEPARATOR */
+/*         0x001C, * FILE SEPARATOR */
+/*         0x001D, * GROUP SEPARATOR */
+/*         0x001E, * RECORD SEPARATOR */
        0, 0, 0, 0, 1, 1, 1, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 331ad6cb9751f1a3a61b8b70f0fedc7fde46819a..6a970bbb2bb706e79f4e878b00c587baf4353ee6 100644 (file)
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -377,7 +377,7 @@ warn_explicit(PyObject *category, PyObject *message,
         }
     }
 
-    if (rc == 1)  // Already warned for this module. */
+    if (rc == 1)  /* Already warned for this module. */
         goto return_none;
     if (rc == 0) {
         PyObject *show_fxn = get_warnings_attr("showwarning");
@@ -800,8 +800,8 @@ static PyMethodDef warnings_functions[] = {
         warn_doc},
     {"warn_explicit", (PyCFunction)warnings_warn_explicit,
         METH_VARARGS | METH_KEYWORDS, warn_explicit_doc},
-    // XXX(brett.cannon): add showwarning?
-    // XXX(brett.cannon): Reasonable to add formatwarning?
+    /* XXX(brett.cannon): add showwarning? */
+    /* XXX(brett.cannon): Reasonable to add formatwarning? */
     {NULL, NULL}               /* sentinel */
 };