diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-12 17:56:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-12 17:56:39 -0500 |
| commit | e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f (patch) | |
| tree | b2717634a496f982c82b13c6aa67252caad85268 /tdeioslave | |
| parent | 1346f6898707e6a4d95abee07c3d1608fc056998 (diff) | |
| parent | 68cfc4fec0fed7ef4da9f03da68bd61900654ee3 (diff) | |
| download | tdebase-e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f.tar.gz tdebase-e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/nfs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tdeioslave/smtp/smtp.cc | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tdeioslave/nfs/CMakeLists.txt b/tdeioslave/nfs/CMakeLists.txt index c6ccd04f8..b45824d73 100644 --- a/tdeioslave/nfs/CMakeLists.txt +++ b/tdeioslave/nfs/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc index 43c15ecd2..00dff3684 100644 --- a/tdeioslave/smtp/smtp.cc +++ b/tdeioslave/smtp/smtp.cc @@ -30,6 +30,11 @@ #include <config.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#include <stdio.h> + #ifdef HAVE_LIBSASL2 extern "C" { #include <sasl/sasl.h> @@ -71,12 +76,8 @@ using std::auto_ptr; #include <ctype.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> #include <assert.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif |