summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-04-14 02:52:02 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-04-14 02:52:02 +0000
commitaa1a1388081db6f1592db823c69bd699ca172683 (patch)
tree95fcedd67405fff46e7b5197de70e979581c8fe7
parent03fad3472eabe457a6bc37989edd875f081b529b (diff)
Add AC_C_INLINE so we can use "inline" keyword
Add "inline" to max function definition
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac3
-rw-r--r--greeter/Login.c4
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d3f961d..26d0045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-13 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * configure.ac:
+ Add AC_C_INLINE so we can use "inline" keyword
+
+ * greeter/Login.c:
+ Add "inline" to max function definition
+
2006-04-11 Alan Coopersmith <alan.coopersmith@sun.com>
* greeter/Login.c:
diff --git a/configure.ac b/configure.ac
index d1c6f8a..fef937c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-dnl $XdotOrg: app/xdm/configure.ac,v 1.37 2006/03/30 21:14:31 alanc Exp $
+dnl $XdotOrg: app/xdm/configure.ac,v 1.38 2006/03/31 02:19:01 alanc Exp $
AC_PREREQ([2.57])
AC_INIT(xdm,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
@@ -31,6 +31,7 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+AC_C_INLINE
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_PROG_INSTALL
diff --git a/greeter/Login.c b/greeter/Login.c
index c0237a8..cd37bd7 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: app/xdm/greeter/Login.c,v 1.3 2006/02/24 18:09:00 alanc Exp $ */
+/* $XdotOrg: app/xdm/greeter/Login.c,v 1.4 2006/04/12 01:57:46 alanc Exp $ */
/* $Xorg: Login.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
/*
@@ -248,7 +248,7 @@ static XtResource resources[] = {
FAIL_Y_INC(w)))
#ifndef max
-static int max (int a, int b) { return a > b ? a : b; }
+static inline int max (int a, int b) { return a > b ? a : b; }
#endif
static void