author | mickeyl <mickeyl> | 2004-05-09 18:28:52 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-09 18:28:52 (UTC) |
commit | d43222da148755b44c74b176cde4dec5c56e1a79 (patch) (side-by-side diff) | |
tree | b4fd6b8369deae40c78fd7f5ba12a13636cff831 /libopie2/opiedb | |
parent | 81bc0cecdeb7c49f4f2950c1e5649bad05593d0c (diff) | |
download | opie-d43222da148755b44c74b176cde4dec5c56e1a79.zip opie-d43222da148755b44c74b176cde4dec5c56e1a79.tar.gz opie-d43222da148755b44c74b176cde4dec5c56e1a79.tar.bz2 |
POSIX claims the includer of regex.h MUST include sys/types.h prior to including it.
Thus we can unify the case and unconditionally.
-rw-r--r-- | libopie2/opiedb/osqlitedriver.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h index 33037b8..e38fd52 100644 --- a/libopie2/opiedb/osqlitedriver.h +++ b/libopie2/opiedb/osqlitedriver.h @@ -1,56 +1,51 @@ #ifndef OSQL_LITE_DRIVER_H #define OSQL_LITE_DRIVER_H #include <sqlite.h> -#if defined (__GNUC__) && (__GNUC__ < 3) #include <sys/types.h> -#endif -#ifdef Q_OS_MACX -#include <sys/types.h> -#endif #include <regex.h> #include "osqldriver.h" #include "osqlerror.h" #include "osqlresult.h" namespace Opie { namespace DB { namespace Internal { struct sqregex { char *regex_raw; regex_t regex_c; }; class OSQLiteDriver : public OSQLDriver { Q_OBJECT public: OSQLiteDriver( QLibrary *lib = 0l ); ~OSQLiteDriver(); QString id()const; void setUserName( const QString& ); void setPassword( const QString& ); void setUrl( const QString& url ); void setOptions( const QStringList& ); bool open(); bool close(); OSQLError lastError(); OSQLResult query( OSQLQuery* ); OSQLTable::ValueList tables()const; private: OSQLError m_lastE; OSQLResult m_result; OSQLResultItem m_items; int handleCallBack( int, char**, char** ); static int call_back( void*, int, char**, char** ); QString m_url; sqlite *m_sqlite; sqregex sqreg; }; } } } #endif |