Fix compilation errors. Not tested yet.

wentaoshang · Sep 20, 2013 · d145840 · d145840
1 parent 8d2dac1
commit d145840
Show file tree

Hide file tree

Showing 9 changed files with 594 additions and 173 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,13 @@
 *.cc~
 *.h~
 
-ndnfs
 
 .DS_Store
 .lock*
 .waf*
 build/
+
+*.db
+*.dat
+*.properties
+*.pyc
diff --git a/server/dir.proto b/server/dir.proto
@@ -3,12 +3,7 @@ package ndnfs;
 message DirInfo
 {
   required string path = 1;
-  enum Type
-  {
-    DIR = 0;
-    FILE = 1;
-  }
-  required Type type = 2;
+  required int32 type = 2;
 }
 
 message DirInfoArray

diff --git a/server/file.proto b/server/file.proto
@@ -2,8 +2,8 @@ package ndnfs;
 
 message FileInfo
 {
-  required int size = 1;
-  required int totalseg = 2;
-  required uint64_t version = 3;//
+  required int32 size = 1;
+  required int32 totalseg = 2;
+  required uint64 version = 3;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,9 +6,13 @@ @@
     *.cc~
     *.h~
-    ndnfs
     .DS_Store
     .lock*
     .waf*
     build/
+    *.db
+    *.dat
+    *.properties
+    *.pyc