Author: yamakenz
Date: Mon Aug 27 23:08:24 2007
New Revision: 4921

Modified:
   trunk/configure.ac
   trunk/uim/uim-helper.c
   trunk/uim/uim-internal.h

Log:
* configure.ac
  - Add check for issetugid(2)
* uim/uim-internal.h
  - (uim_issetugid): Define uim_issetugid() as just an alias macro to
    issetugid(2) if available
* uim/uim-helper.c
  - (uim_issetugid): Enclose into #if !HAVE_ISSETUGID


Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Mon Aug 27 23:08:24 2007
@@ -454,6 +454,7 @@
 AC_CHECK_FUNCS([execv execvp])
 AC_CHECK_FUNCS([isascii])
 AC_CHECK_FUNCS([getaddrinfo freeaddrinfo getnameinfo])
+AC_CHECK_FUNCS([issetugid])
 
 # IRIX has a const char return value for gai_strerror()
 AC_CHECK_FUNCS(gai_strerror,[

Modified: trunk/uim/uim-helper.c
==============================================================================
--- trunk/uim/uim-helper.c      (original)
+++ trunk/uim/uim-helper.c      Mon Aug 27 23:08:24 2007
@@ -285,6 +285,7 @@
   return (uim_issetugid()) ? UIM_TRUE : UIM_FALSE;
 }
 
+#if !HAVE_ISSETUGID
 /* For internal use only. libuim clients should use uim_helper_is_setugid()
  * since this is not a core uim function. */
 uim_bool
@@ -297,3 +298,4 @@
 
   return (ruid != euid || rgid != egid);
 }
+#endif /* !HAVE_ISSETUGID */

Modified: trunk/uim/uim-internal.h
==============================================================================
--- trunk/uim/uim-internal.h    (original)
+++ trunk/uim/uim-internal.h    Mon Aug 27 23:08:24 2007
@@ -38,6 +38,9 @@
 #if UIM_USE_ERROR_GUARD
 #include <setjmp.h>
 #endif
+#if HAVE_ISSETUGID
+#include <unistd.h>
+#endif
 
 #include "uim.h"
 #include "uim-scm.h"
@@ -157,7 +160,11 @@
 void uim_init_rk_subrs(void);
 void uim_init_intl_subrs(void);
 
+#if HAVE_ISSETUGID
+#define uim_issetugid() issetugid()
+#else
 uim_bool uim_issetugid(void);
+#endif
 
 
 #if UIM_USE_ERROR_GUARD

Reply via email to