summaryrefslogtreecommitdiffstats
path: root/src/appl
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2014-07-05 11:50:58 -0400
committerGreg Hudson <ghudson@mit.edu>2014-07-08 19:19:24 -0400
commit02a1123cf44381690c28f18ab2c4ba8036200539 (patch)
tree821ad7e29d2f90227b6f12dc63aaae948baa2447 /src/appl
parent6a8da91b691b8f51ac62d8142cd2fa32a69f3d15 (diff)
downloadkrb5-02a1123cf44381690c28f18ab2c4ba8036200539.tar.gz
krb5-02a1123cf44381690c28f18ab2c4ba8036200539.tar.xz
krb5-02a1123cf44381690c28f18ab2c4ba8036200539.zip
Include autoconf.h before system headers
Include autoconf.h (either directly or via proxy) before system headers, so that feature test macros defined there can affect the system namespace. Where include order was changed, eliminate some redundant or unnecessary includes. ticket: 7961
Diffstat (limited to 'src/appl')
-rw-r--r--src/appl/gss-sample/gss-misc.c4
-rw-r--r--src/appl/simple/client/sim_client.c15
-rw-r--r--src/appl/user_user/client.c9
-rw-r--r--src/appl/user_user/server.c12
4 files changed, 15 insertions, 25 deletions
diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c
index 3a87fcd04..080ac4d0c 100644
--- a/src/appl/gss-sample/gss-misc.c
+++ b/src/appl/gss-sample/gss-misc.c
@@ -44,6 +44,8 @@
* or implied warranty.
*/
+#include <autoconf.h>
+
#include <stdio.h>
#ifdef _WIN32
#include <windows.h>
@@ -55,8 +57,6 @@
#endif
#include <errno.h>
-#include <autoconf.h>
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 835d85f88..aaa6446c6 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -29,25 +29,20 @@
* This program performs no useful function.
*/
+#include <k5-int.h>
+#include "com_err.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
-#include <errno.h>
-
-#include <k5-int.h>
-#include "com_err.h"
-
-#include "simple.h"
-
-#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include "simple.h"
+
/* for old Unixes and friends ... */
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 64
diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index 3d5fc51f1..28901a637 100644
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -24,17 +24,14 @@
* or implied warranty.
*/
+#include "k5-int.h"
+#include "com_err.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "k5-int.h"
-#include "com_err.h"
int main (int argc, char *argv[])
{
diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index dbff68e64..09ea4e0ed 100644
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -1,3 +1,4 @@
+
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
/* appl/user_user/server.c - One end of user-user client-server pair */
/*
@@ -24,20 +25,17 @@
* or implied warranty.
*/
+#include "k5-int.h"
+#include "port-sockets.h"
+#include "com_err.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <errno.h>
-
-#include "port-sockets.h"
-#include "k5-int.h"
-#include "com_err.h"
/* fd 0 is a tcp socket used to talk to the client */