author | mickeyl <mickeyl> | 2005-06-22 09:00:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-22 09:00:42 (UTC) |
commit | c7d80acef0bab4babadac288796117987bb4e846 (patch) (unidiff) | |
tree | e2fcb8c4f6c7403c4c8a84e4dbe3b97cb88af109 | |
parent | b17740434153d8368133b412939cdbe5f4a26c02 (diff) | |
download | opie-c7d80acef0bab4babadac288796117987bb4e846.zip opie-c7d80acef0bab4babadac288796117987bb4e846.tar.gz opie-c7d80acef0bab4babadac288796117987bb4e846.tar.bz2 |
Note to self: Don't commit local changes...
-rw-r--r-- | libopie2/opiecore/linux/linux.pro | 2 | ||||
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro index c0c4f7f..d2e36ae 100644 --- a/libopie2/opiecore/linux/linux.pro +++ b/libopie2/opiecore/linux/linux.pro | |||
@@ -5,7 +5,7 @@ HEADERS += \ | |||
5 | 5 | ||
6 | SOURCES += \ | 6 | SOURCES += \ |
7 | linux/ofilenotify.cpp \ | 7 | linux/ofilenotify.cpp \ |
8 | linux/oinputsystem.cpp \ | 8 | linux/oinputsystem.cpp \ |
9 | linux/opcmciasystem.cpp | 9 | linux/opcmciasystem.cpp |
10 | 10 | ||
11 | DEFINES += OPCMCIA_DEBUG=1 | 11 | # DEFINES += OPCMCIA_DEBUG=1 |
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 445d903..2b0c01d 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -203,16 +203,18 @@ OPcmciaSocket::~OPcmciaSocket() | |||
203 | { | 203 | { |
204 | _fd = ::open( (const char*) filename, O_RDONLY); | 204 | _fd = ::open( (const char*) filename, O_RDONLY); |
205 | if ( !_fd ) | 205 | if ( !_fd ) |
206 | { | 206 | { |
207 | qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); | 207 | qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); |
208 | } | 208 | } |
209 | #ifndef OPCMCIA_DEBUG | ||
209 | else | 210 | else |
210 | { | 211 | { |
211 | ::unlink( (const char*) filename ); | 212 | ::unlink( (const char*) filename ); |
212 | } | 213 | } |
214 | #endif | ||
213 | } | 215 | } |
214 | else | 216 | else |
215 | { | 217 | { |
216 | qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); | 218 | qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); |
217 | } | 219 | } |
218 | } | 220 | } |