r884: convert samba4 to use [u]int32_t instead of [u]int32

metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)

4 files changed, 15 insertions, 15 deletions

diff --git a/source4/smbd/build_options.c b/source4/smbd/build_options.c
index e450fee436..dea17df2e0 100644
--- a/source4/smbd/build_options.c
+++ b/source4/smbd/build_options.c
@@ -526,7 +526,7 @@ void build_options(BOOL screen)
        output(screen,"   sizeof(long):    %d\n",sizeof(long));
        output(screen,"   sizeof(uint8):   %d\n",sizeof(uint8));
        output(screen,"   sizeof(uint16):  %d\n",sizeof(uint16));
-       output(screen,"   sizeof(uint32):  %d\n",sizeof(uint32));
+       output(screen,"   sizeof(uint32_t):  %d\n",sizeof(uint32_t));
        output(screen,"   sizeof(short):   %d\n",sizeof(short));
        output(screen,"   sizeof(void*):   %d\n",sizeof(void*));
 }
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index dcd2f456af..d37cf8d7ff 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -192,16 +192,16 @@ static int thread_mutex_lock(smb_mutex_t *mutexP, const char *name)
 		if (rc == EBUSY) {
 			mutex_start_timer(&tp1);
 			printf("mutex lock: thread %d, lock %s not available\n", 
-				(uint32)pthread_self(), name);
+				(uint32_t)pthread_self(), name);
 			print_suspicious_usage("mutex_lock", name);
 			pthread_mutex_lock(mutex);
 			t = mutex_end_timer(tp1);
 			printf("mutex lock: thread %d, lock %s now available, waited %g seconds\n", 
-				(uint32)pthread_self(), name, t);
+				(uint32_t)pthread_self(), name, t);
 			return 0;
 		}
 		printf("mutex lock: thread %d, lock %s failed rc=%d\n", 
-				(uint32)pthread_self(), name, rc);
+				(uint32_t)pthread_self(), name, rc);
 		SMB_ASSERT(errno == 0); /* force error */
 	}
 	return 0;
@@ -254,16 +254,16 @@ static int thread_rwlock_lock_read(smb_rwlock_t *rwlockP, const char *name)
 		if (rc == EBUSY) {
 			mutex_start_timer(&tp1);
 			printf("rwlock lock_read: thread %d, lock %s not available\n", 
-				(uint32)pthread_self(), name);
+				(uint32_t)pthread_self(), name);
 			print_suspicious_usage("rwlock_lock_read", name);
 			pthread_rwlock_rdlock(rwlock);
 			t = mutex_end_timer(tp1);
 			printf("rwlock lock_read: thread %d, lock %s now available, waited %g seconds\n", 
-				(uint32)pthread_self(), name, t);
+				(uint32_t)pthread_self(), name, t);
 			return 0;
 		}
 		printf("rwlock lock_read: thread %d, lock %s failed rc=%d\n", 
-				(uint32)pthread_self(), name, rc);
+				(uint32_t)pthread_self(), name, rc);
 		SMB_ASSERT(errno == 0); /* force error */
 	}
 	return 0;
@@ -283,16 +283,16 @@ static int thread_rwlock_lock_write(smb_rwlock_t *rwlockP, const char *name)
 		if (rc == EBUSY) {
 			mutex_start_timer(&tp1);
 			printf("rwlock lock_write: thread %d, lock %s not available\n", 
-				(uint32)pthread_self(), name);
+				(uint32_t)pthread_self(), name);
 			print_suspicious_usage("rwlock_lock_write", name);
 			pthread_rwlock_wrlock(rwlock);
 			t = mutex_end_timer(tp1);
 			printf("rwlock lock_write: thread %d, lock %s now available, waited %g seconds\n", 
-				(uint32)pthread_self(), name, t);
+				(uint32_t)pthread_self(), name, t);
 			return 0;
 		}
 		printf("rwlock lock_write: thread %d, lock %s failed rc=%d\n", 
-				(uint32)pthread_self(), name, rc);
+				(uint32_t)pthread_self(), name, rc);
 		SMB_ASSERT(errno == 0); /* force error */
 	}
 	return 0;
@@ -354,16 +354,16 @@ static void thread_print_suspicious_usage(const char* from, const char* info)
 #endif
 }
 
-static uint32 thread_get_task_id(void)
+static uint32_t thread_get_task_id(void)
 {
-	return (uint32)pthread_self();
+	return (uint32_t)pthread_self();
 }
 
 static void thread_log_task_id(int fd)
 {
 	char *s;
 	
-	asprintf(&s, "thread %u: ", (uint32)pthread_self());
+	asprintf(&s, "thread %u: ", (uint32_t)pthread_self());
 	write(fd, s, strlen(s));
 	free(s);
 }
diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c
index 6dc130d279..38b8ad3015 100644
--- a/source4/smbd/rewrite.c
+++ b/source4/smbd/rewrite.c
@@ -44,7 +44,7 @@ BOOL share_info_db_init(void)
 BOOL init_registry(void)
 { return True; }
 
-BOOL share_access_check(struct request_context *req, struct tcon_context *conn, int snum, uint32 desired_access)
+BOOL share_access_check(struct request_context *req, struct tcon_context *conn, int snum, uint32_t desired_access)
 { return True; }
 
 BOOL init_names(void)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index f32d6a0702..8a06a5b7df 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -302,7 +302,7 @@ static void setup_process_model(struct event_context *events,
 	/* Output the build options to the debug log */ 
 	build_options(False);
 
-	if (sizeof(uint16) < 2 || sizeof(uint32) < 4) {
+	if (sizeof(uint16) < 2 || sizeof(uint32_t) < 4) {
 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
 		exit(1);
 	}