]> err.no Git - sope/blobdiff - sope-core/NGStreams/NGFileStream.m
Drop apache 1 build-dependency
[sope] / sope-core / NGStreams / NGFileStream.m
index 4b99c1525f7ef6cdf306b857c9a379dfaca00ed8..c720ee64932183b286b6181c3e34363bc5b12525 100644 (file)
 #  include <fcntl.h>
 #endif
 
+#include <NGStreams/NGFileStream.h>
+#include <NGStreams/NGBufferedStream.h>
+#include <NGStreams/NGConcreteStreamFileHandle.h>
+#include <NGStreams/NGLockingStream.h>
+#include <NGStreams/NGStreamExceptions.h>
+#include <NGStreams/NGDescriptorFunctions.h>
 #include "common.h"
 #import <Foundation/NSThread.h>
-#include "NGFileStream.h"
-#include "NGBufferedStream.h"
-#include "NGConcreteStreamFileHandle.h"
-#include "NGLockingStream.h"
-#include "NGStreamExceptions.h"
-#include "NGDescriptorFunctions.h"
 
 #if !defined(POLLRDNORM)
 #  define POLLRDNORM POLLIN
@@ -634,13 +634,14 @@ static void _checkOpen(NGFileStream *self, NSString *_reason) {
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                     @"<%@[0x%08X] path=%@ mode=%@>",
-                     NSStringFromClass([self class]), (unsigned)self,
-                     self->systemPath ? self->systemPath : @"nil",
+                     @"<%@[0x%p] path=%@ mode=%@>",
+                     NSStringFromClass([self class]), self,
+                    self->systemPath ? self->systemPath : (NSString *)@"nil",
                      [self modeDescription]];
 }
 
-@end
+@end /* NGFileStream */
+
 
 @implementation _NGConcreteFileStreamFileHandle