simplify #ifdefs

diff --git a/src/store_client.cc b/src/store_client.cc
index e91210b2b2d6b391664367d452e57eab4bf7934d..c724a5bbeae44545aa89aa551f548d907130b2e9 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.39 1998/08/20 22:30:05 wessels Exp $
+ * $Id: store_client.cc,v 1.40 1998/08/24 21:07:51 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -275,23 +275,17 @@ storeClientFileRead(store_client * sc)
 {
     MemObject *mem = sc->entry->mem_obj;
     assert(sc->callback != NULL);
-#ifndef OPTIMISTIC_IO
-    if (mem->swap_hdr_sz == 0)
-#else
+#ifdef OPTIMISTIC_IO
     sc->flags.disk_io_pending = 1;
-    if (mem->swap_hdr_sz == 0) {
 #endif
+    if (mem->swap_hdr_sz == 0) {
        file_read(sc->swapin_fd,
            sc->copy_buf,
            sc->copy_size,
            0,
            storeClientReadHeader,
            sc);
-#ifndef OPTIMISTIC_IO
-       else {
-#else
     } else {
-#endif
        if (sc->entry->swap_status == SWAPOUT_WRITING)
            assert(mem->swapout.done_offset > sc->copy_offset + mem->swap_hdr_sz);
        file_read(sc->swapin_fd,