在冲突解决一节结束后,我们的main.c文件的内容如下
1 #include <stdio.h> 2 #include "add.h" 3 #include "sub.h" 4 5 int main() 6 { 7 printf("5 + 10 = %d.\n",add(5,10)); 8 printf("15 - 10 = %d.\n",sub(15,10)); 9 //kris's test 10 printf("kris: 12 + 28 = %d.\n",add(12,28)); 11 //sally's test 12 printf("sally: 60 - 33 = %d.\n",sub(60,33)); 13 return 0; 14 }
下面,我们做一些修改,具体如下