summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-28 16:55:37 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-28 16:55:37 -0200
commitdbb950061f185e1ccf27bff9c71adc34ab4cfae0 (patch)
tree2b4b7a4c588ec25f7e654932ac20a3d3a9cf23f9 /src
parent2f41ddb3a917c4e71184452b68561a15593d33b8 (diff)
Janitor: Correct sparse warnings.
Also reorders some code in configure.ac and Makefile.am to match pattern used on other packages.
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore6
-rw-r--r--src/ICElibint.h3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/getauth.c4
4 files changed, 4 insertions, 11 deletions
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index f38c26f..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-libICE.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/ICElibint.h b/src/ICElibint.h
index ca61553..42983cc 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -37,6 +37,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEproto.h>
#include <X11/ICE/ICEconn.h>
#include <X11/ICE/ICEmsg.h>
+#include <X11/ICE/ICEutil.h>
#ifdef WIN32
#include <X11/Xwindows.h>
#endif
@@ -410,6 +411,8 @@ extern _IceWatchProc *_IceWatchProcs;
extern IceErrorHandler _IceErrorHandler;
extern IceIOErrorHandler _IceIOErrorHandler;
+extern IceAuthDataEntry _IcePaAuthDataEntries[];
+extern int _IcePaAuthDataEntryCount;
extern void _IceErrorBadMajor (
IceConn /* iceConn */,
diff --git a/src/Makefile.am b/src/Makefile.am
index dc4a0f5..449aeaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
lib_LTLIBRARIES=libICE.la
AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
- -DICE_t -DTRANS_CLIENT -DTRANS_SERVER $(CWARNFLAGS)
+ -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined
diff --git a/src/getauth.c b/src/getauth.c
index 6641512..0e86044 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -33,14 +33,10 @@ Author: Ralph Mor, X Consortium
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/ICE/ICEutil.h>
static Bool auth_valid (const char *auth_name, int num_auth_names,
char **auth_names, int *index_ret);
-extern int _IcePaAuthDataEntryCount;
-extern IceAuthDataEntry _IcePaAuthDataEntries[];
-
/*
* The functions in this file are not a standard part of ICElib.