diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-09-07 18:51:56 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-09-07 18:51:56 +0000 |
commit | 03e12ad5eec7b9f92c3cd900f3084262152a4a1b (patch) | |
tree | a2bb38870182f02eebb4b98d739c142fd4ad621a | |
parent | 3a51628c0f11a06c7b50e273bd0be99ccbe2e07a (diff) | |
download | wireshark-03e12ad5eec7b9f92c3cd900f3084262152a4a1b.tar.gz wireshark-03e12ad5eec7b9f92c3cd900f3084262152a4a1b.tar.bz2 wireshark-03e12ad5eec7b9f92c3cd900f3084262152a4a1b.zip |
Canonicalize the line endings, set the svn:eol-style property to
"native" so they stay canonicalized, and set svn:keywords to Id so that
RCS IDs get expanded.
svn path=/trunk/; revision=11926
-rw-r--r-- | gtk/sctp_stat.c | 20 | ||||
-rw-r--r-- | gtk/sctp_stat.h | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 8936df0580..86a82d5d60 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * - * $Id: sctp_stat.c 11436 2004-07-19 21:42:01Z tuexen $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,18 +26,18 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif #ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h>
-#endif
+#include <sys/socket.h> +#endif #ifndef WIN32 -#include <netinet/in.h>
-#endif
+#include <netinet/in.h> +#endif #ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h>
-#endif
+#include <arpa/inet.h> +#endif #include <stdio.h> #include <gtk/gtk.h> diff --git a/gtk/sctp_stat.h b/gtk/sctp_stat.h index 699384df3c..d14350a835 100644 --- a/gtk/sctp_stat.h +++ b/gtk/sctp_stat.h @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * - * $Id: sctp_stat.h 11436 2004-07-19 21:42:01Z tuexen $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -22,15 +22,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <epan/dissectors/packet-sctp.h>
+#include <epan/dissectors/packet-sctp.h> #ifdef HAVE_SYS_TYPES_H -#include <sys/types.h>
-#endif
+#include <sys/types.h> +#endif #ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h>
-#endif
+#include <sys/socket.h> +#endif #ifndef WIN32 -#include <netinet/in.h>
+#include <netinet/in.h> #endif #define SCTP_DATA_CHUNK_ID 0 |