Changeset 651 for abuse/trunk/src/nfclient.cppTweet

Timestamp:

May 14, 2011, 3:06:27 AM (11 years ago)

Author:

Sam Hocevar

Message:

build: add a --disable-network compilation flag and get rid of most of
the CELLOS_LV2 ifdefs.

File:

• abuse/trunk/src/nfclient.cpp (modified) (14 diffs)

abuse/trunk/src/nfclient.cpp

@@ -30 +30 @@
 #include "cache.h"
 
-#include "gserver.h"
-
-#if !defined __CELLOS_LV2__
+#include "net/gserver.h"
 
 void remove_client(int client_number) { ; }
@@ -115 +113 @@
   }
 
-
+#if HAVE_NETWORK
   if (local_only)
   {
+#endif
     local=new jFILE(filename,mode);
     if (local->open_failure()) { delete local; local=NULL; }
+#if HAVE_NETWORK
   }
   else
   {
-
-
     char nm[256];
     strcpy(nm,filename);
@@ -135 +133 @@
     }
   }
+#endif
 }
 
@@ -149 +148 @@
   if (local)
     return local->read(buf,count);
+#if HAVE_NETWORK
   else if (nfs_fd>=0)
   {
@@ -158 +158 @@
     return a;
   }
+#endif
   else return 0;
 }
@@ -165 +166 @@
   if (local)
     return local->write(buf,count);
+#if HAVE_NETWORK
   else
   {
@@ -170 +172 @@
     exit(0);
   }
+#endif
   return 0;
 }
@@ -178 +181 @@
   if (local)
     return local->seek(off,whence);
+#if HAVE_NETWORK
   else if (nfs_fd>=0)
   {
@@ -185 +189 @@
       return NF_seek(nfs_fd,off);
   }
+#endif
   return 0;
 }
@@ -191 +196 @@
 {
   if (local)          return local->tell();
+#if HAVE_NETWORK
   else if (nfs_fd>=0) return NF_tell(nfs_fd);
+#endif
   else                return 0;
 }
@@ -199 +206 @@
 {
   if (local)          return local->file_size();
+#if HAVE_NETWORK
   else if (nfs_fd>=0) return NF_filelength(nfs_fd);
+#endif
   else                return 0;
 }
@@ -207 +216 @@
   flush_writes();
   if (local)          delete local;
+#if HAVE_NETWORK
   else if (nfs_fd>=0) NF_close(nfs_fd);
+#endif
 }
 
 int set_file_server(net_address *addr)
 {
+#if HAVE_NETWORK
   if (NF_set_file_server(addr))
   {
@@ -229 +241 @@
     return 1;
   }
+#endif
   return 0;
 }
@@ -247 +260 @@
 }
 
-#endif
-