X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgutils.h;h=4a6e93bcb8650a8e9cae70cacc41ec59fe97032b;hb=20f6cc2a10ba26860e7a6d27c100deadb5497772;hp=8c09b7d508941a80ce9246bd3f4f0b86398968e6;hpb=b91c47682749b7e1455305ec5f99d5f950574a36;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/gutils.h b/glib/gutils.h
index 8c09b7d..4a6e93b 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -43,15 +41,15 @@ G_BEGIN_DECLS
 #  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
 #    define G_VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
 #  elif defined (G_VA_COPY_AS_ARRAY)
-#    define G_VA_COPY(ap1, ap2)	  g_memmove ((ap1), (ap2), sizeof (va_list))
+#    define G_VA_COPY(ap1, ap2)	  memmove ((ap1), (ap2), sizeof (va_list))
 #  else /* va_list is a pointer */
 #    define G_VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
 #  endif /* va_list is a pointer */
 #endif /* !G_VA_COPY */
 
-/* inlining hassle. for compilers that don't allow the `inline' keyword,
+/* inlining hassle. for compilers that don't allow the 'inline' keyword,
  * mostly because of strict ANSI C compliance or dumbness, we try to fall
- * back to either `__inline__' or `__inline'.
+ * back to either '__inline__' or '__inline'.
  * G_CAN_INLINE is defined in glibconfig.h if the compiler seems to be 
  * actually *capable* to do function inlining, in which case inline 
  * function bodies do make sense. we also define G_INLINE_FUNC to properly 
@@ -239,16 +237,7 @@ gchar *g_format_size_for_display (goffset size);
  * function passed to g_atexit().
  */
 typedef void (*GVoidFunc) (void);
-#ifndef ATEXIT
-# define ATEXIT(proc) g_ATEXIT(proc)
-#else
-# define G_NATIVE_ATEXIT
-#endif /* ATEXIT */
-/* we use a GLib function as a replacement for ATEXIT, so
- * the programmer is not required to check the return value
- * (if there is any in the implementation) and doesn't encounter
- * missing include files.
- */
+#define ATEXIT(proc) g_ATEXIT(proc)
 GLIB_DEPRECATED
 void	g_atexit		(GVoidFunc    func);
 
@@ -318,7 +307,7 @@ g_bit_storage (gulong number)
   return G_LIKELY (number) ?
 	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ (guint) __builtin_clzl(number)) + 1 : 1;
 #else
-  register guint n_bits = 0;
+  guint n_bits = 0;
   
   do
     {
@@ -380,25 +369,6 @@ DllMain (HINSTANCE hinstDLL,						\
 
 #endif /* G_PLATFORM_WIN32 */
 
-#ifdef G_OS_WIN32
-#define g_get_user_name        g_get_user_name_utf8
-#define g_get_real_name        g_get_real_name_utf8
-#define g_get_home_dir         g_get_home_dir_utf8
-#define g_get_tmp_dir          g_get_tmp_dir_utf8
-#define g_find_program_in_path g_find_program_in_path_utf8
-
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_get_user_name_utf8        (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_get_real_name_utf8        (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_get_home_dir_utf8         (void);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_get_tmp_dir_utf8          (void);
-GLIB_AVAILABLE_IN_ALL
-gchar       *g_find_program_in_path_utf8 (const gchar *program);
-#endif
-
 G_END_DECLS
 
 #endif /* __G_UTILS_H__ */