define gstring in terms of gchar*. this typedef reflects the type name of

[platform/upstream/glib.git] / glib.h

diff --git a/glib.h b/glib.h
index b05f2bf..7baeb48 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -74,6 +74,17 @@
  */
 #include <glibconfig.h>
 
+/* Define some mathematical constants that aren't available
+ * symbolically in some strict ISO C implementations.
+ */
+#define G_E     2.7182818284590452354E0
+#define G_LN2   6.9314718055994530942E-1
+#define G_LN10  2.3025850929940456840E0
+#define G_PI    3.14159265358979323846E0
+#define G_PI_2  1.57079632679489661923E0
+#define G_PI_4  0.78539816339744830962E0
+#define G_SQRT2 1.4142135623730950488E0
+
 /* include varargs functions for assertment macros
  */
 #include <stdarg.h>
@@ -489,6 +500,7 @@ typedef short  gshort;
 typedef long   glong;
 typedef int    gint;
 typedef gint   gboolean;
+typedef gchar* gstring;
 
 typedef unsigned char  guchar;
 typedef unsigned short gushort;
@@ -1697,6 +1709,9 @@ gchar*  g_path_skip_root  (gchar       *file_name);
 gchar* g_dirname               (const gchar *file_name);
 gchar* g_get_current_dir       (void);
 
+/* Get the codeset for the current locale */
+gchar * g_get_codeset    (void);
+
 /* return the environment string for the variable. The returned memory
  * must not be freed. */
 gchar*  g_getenv               (const gchar *variable);
@@ -1853,7 +1868,7 @@ void           g_string_free              (GString         *string,
 GString*     g_string_assign            (GString        *string,
                                         const gchar     *rval);
 GString*     g_string_truncate          (GString        *string,
-                                        gint             len);
+                                        guint            len);
 GString*     g_string_insert_len        (GString         *string,
                                          gint             pos,
                                          const gchar     *val,
@@ -3307,9 +3322,10 @@ guint           g_thread_pool_get_num_unused_threads (void);
 /* Stop all currently unused threads, but leave the limit untouched */
 void            g_thread_pool_stop_unused_threads    (void);
 
+#include <gunicode.h>
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-
 #endif /* __G_LIB_H__ */