Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/PC/make_versioninfo.c

    r2 r391  
    2323int main(int argc, char **argv)
    2424{
    25         printf("/* This file created by make_versioninfo.exe */\n");
    26         printf("#define FIELD3 %d\n",
    27                 PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL);
    28         printf("#define MS_DLL_ID \"%d.%d\"\n",
    29                PY_MAJOR_VERSION, PY_MINOR_VERSION);
    30         printf("#ifndef _DEBUG\n");
    31         printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n",
    32                PY_MAJOR_VERSION, PY_MINOR_VERSION);
    33         printf("#else\n");
    34         printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n",
    35                PY_MAJOR_VERSION, PY_MINOR_VERSION);
    36         printf("#endif\n");
    37         return 0;
     25    printf("/* This file created by make_versioninfo.exe */\n");
     26    printf("#define FIELD3 %d\n",
     27        PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL);
     28    printf("#define MS_DLL_ID \"%d.%d\"\n",
     29           PY_MAJOR_VERSION, PY_MINOR_VERSION);
     30    printf("#ifndef _DEBUG\n");
     31    printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n",
     32           PY_MAJOR_VERSION, PY_MINOR_VERSION);
     33    printf("#else\n");
     34    printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n",
     35           PY_MAJOR_VERSION, PY_MINOR_VERSION);
     36    printf("#endif\n");
     37    return 0;
    3838}
Note: See TracChangeset for help on using the changeset viewer.