From d92bc4c59aa0bec3a547be35044c4dcd55e034f9 Mon Sep 17 00:00:00 2001 From: chai2010 Date: Sun, 22 Jul 2018 16:34:24 +0800 Subject: [PATCH] =?UTF-8?q?ch2:=20=E5=88=A0=E9=99=A4py=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SUMMARY.md | 5 ++--- ch2-cgo/{ch2-11-link.md => ch2-10-link.md} | 2 +- ch2-cgo/{ch2-12-ext.md => ch2-11-ext.md} | 2 +- {ch2-cgo => draft}/ch2-10-py-module.md | 0 4 files changed, 4 insertions(+), 5 deletions(-) rename ch2-cgo/{ch2-11-link.md => ch2-10-link.md} (99%) rename ch2-cgo/{ch2-12-ext.md => ch2-11-ext.md} (97%) rename {ch2-cgo => draft}/ch2-10-py-module.md (100%) diff --git a/SUMMARY.md b/SUMMARY.md index fe8bc25..ea2e273 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -19,9 +19,8 @@ * [2.7. CGO内存模型](ch2-cgo/ch2-07-memory.md) * [2.8. C++类包装](ch2-cgo/ch2-08-class.md) * [2.9. 静态库和动态库](ch2-cgo/ch2-09-static-shared-lib.md) - * [2.10. Go实现Python模块](ch2-cgo/ch2-10-py-module.md) - * [2.11. 编译和链接参数](ch2-cgo/ch2-11-link.md) - * [2.12. 补充说明](ch2-cgo/ch2-12-ext.md) + * [2.10. 编译和链接参数](ch2-cgo/ch2-10-link.md) + * [2.11. 补充说明](ch2-cgo/ch2-11-ext.md) * [第三章 汇编语言](ch3-asm/readme.md) * [3.1. 快速入门](ch3-asm/ch3-01-basic.md) * [3.2. 计算机结构](ch3-asm/ch3-02-arch.md) diff --git a/ch2-cgo/ch2-11-link.md b/ch2-cgo/ch2-10-link.md similarity index 99% rename from ch2-cgo/ch2-11-link.md rename to ch2-cgo/ch2-10-link.md index d9f9824..76c51ca 100644 --- a/ch2-cgo/ch2-11-link.md +++ b/ch2-cgo/ch2-10-link.md @@ -1,4 +1,4 @@ -# 2.11. 编译和链接参数 +# 2.10. 编译和链接参数 编译和链接参数是每一个C/C++程序员需要经常面对的问题。构建每一个C/C++应用均需要经过编译和链接两个步骤,CGO也是如此。 本节我们将简要讨论CGO中经常用到的编译和链接参数的用法。 diff --git a/ch2-cgo/ch2-12-ext.md b/ch2-cgo/ch2-11-ext.md similarity index 97% rename from ch2-cgo/ch2-12-ext.md rename to ch2-cgo/ch2-11-ext.md index a3f275d..e5a672f 100644 --- a/ch2-cgo/ch2-12-ext.md +++ b/ch2-cgo/ch2-11-ext.md @@ -1,4 +1,4 @@ -## 2.12. 补充说明 +## 2.11. 补充说明 CGO是C语言和Go语言混合编程的技术,因此要想熟练地使用CGO需要了解这两门语言。C语言推荐两本书:第一本是C语言之父编写的《C程序设计语言》;第二本是讲述C语言模块化编程的《C语言接口与实现:创建可重用软件的技术》。Go语言推荐官方出版的《The Go Programming Language》和Go语言自带的全部文档和全部代码。 diff --git a/ch2-cgo/ch2-10-py-module.md b/draft/ch2-10-py-module.md similarity index 100% rename from ch2-cgo/ch2-10-py-module.md rename to draft/ch2-10-py-module.md