summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/dynconfig.h2
-rw-r--r--source4/include/includes.h2
-rw-r--r--source4/include/pstring.h3
-rw-r--r--source4/include/rap.h28
4 files changed, 19 insertions, 16 deletions
diff --git a/source4/include/dynconfig.h b/source4/include/dynconfig.h
index 48e02c078a..a95e67a90d 100644
--- a/source4/include/dynconfig.h
+++ b/source4/include/dynconfig.h
@@ -25,6 +25,8 @@
* @brief Exported global configurations.
**/
+#include "pstring.h"
+
extern char const *dyn_SBINDIR,
*dyn_BINDIR;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index cef5e982c7..890491f884 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -120,7 +120,6 @@ extern int errno;
#include "debug.h"
#include "doserr.h"
#include "enums.h"
-#include "pstring.h"
#include "smb_macros.h"
#include "smb.h"
#include "lib/socket/socket.h"
@@ -137,7 +136,6 @@ extern int errno;
#include "smb_interfaces.h"
#include "ntvfs/ntvfs.h"
#include "cli_context.h"
-#include "nsswitch/winbind_client.h"
#include "ads.h"
#define malloc_p(type) (type *)malloc(sizeof(type))
diff --git a/source4/include/pstring.h b/source4/include/pstring.h
index 5bd03ec0d8..3683849686 100644
--- a/source4/include/pstring.h
+++ b/source4/include/pstring.h
@@ -25,6 +25,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef _PSTRING
+
#define PSTRING_LEN 1024
#define FSTRING_LEN 256
@@ -32,3 +34,4 @@ typedef char pstring[PSTRING_LEN];
typedef char fstring[FSTRING_LEN];
#define _PSTRING
+#endif
diff --git a/source4/include/rap.h b/source4/include/rap.h
index 0477192d9e..c831f6f007 100644
--- a/source4/include/rap.h
+++ b/source4/include/rap.h
@@ -286,7 +286,7 @@ struct rap_shareenum_info_0 {
struct rap_shareenum_info_1 {
char name[13];
char pad;
- uint16 type;
+ uint16_t type;
char *comment;
};
@@ -297,15 +297,15 @@ union rap_shareenum_info {
struct rap_NetShareEnum {
struct {
- uint16 level;
- uint16 bufsize;
+ uint16_t level;
+ uint16_t bufsize;
} in;
struct {
- uint16 status;
- uint16 convert;
- uint16 count;
- uint16 available;
+ uint16_t status;
+ uint16_t convert;
+ uint16_t count;
+ uint16_t available;
union rap_shareenum_info *info;
} out;
};
@@ -329,17 +329,17 @@ union rap_server_info {
struct rap_NetServerEnum2 {
struct {
- uint16 level;
- uint16 bufsize;
- uint32 servertype;
+ uint16_t level;
+ uint16_t bufsize;
+ uint32_t servertype;
const char *domain;
} in;
struct {
- uint16 status;
- uint16 convert;
- uint16 count;
- uint16 available;
+ uint16_t status;
+ uint16_t convert;
+ uint16_t count;
+ uint16_t available;
union rap_server_info *info;
} out;
};