hook gvariant vectors up to kdbus

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

diff --git a/glib/gtimer.h b/glib/gtimer.h
index 823d634..b897f1f 100644 (file)
--- a/glib/gtimer.h
+++ b/glib/gtimer.h
@@ -12,22 +12,24 @@
  * 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/>.
  */
 
 /*
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __G_TIMER_H__
 #define __G_TIMER_H__
 
-#include <gtypes.h>
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
@@ -39,18 +41,33 @@ typedef struct _GTimer              GTimer;
 
 #define G_USEC_PER_SEC 1000000
 
-GTimer* g_timer_new    (void);
-void   g_timer_destroy (GTimer   *timer);
-void   g_timer_start   (GTimer   *timer);
-void   g_timer_stop    (GTimer   *timer);
-void   g_timer_reset   (GTimer   *timer);
-gdouble g_timer_elapsed (GTimer          *timer,
-                        gulong   *microseconds);
+GLIB_AVAILABLE_IN_ALL
+GTimer*  g_timer_new            (void);
+GLIB_AVAILABLE_IN_ALL
+void    g_timer_destroy         (GTimer      *timer);
+GLIB_AVAILABLE_IN_ALL
+void    g_timer_start           (GTimer      *timer);
+GLIB_AVAILABLE_IN_ALL
+void    g_timer_stop            (GTimer      *timer);
+GLIB_AVAILABLE_IN_ALL
+void    g_timer_reset           (GTimer      *timer);
+GLIB_AVAILABLE_IN_ALL
+void    g_timer_continue        (GTimer      *timer);
+GLIB_AVAILABLE_IN_ALL
+gdouble  g_timer_elapsed         (GTimer      *timer,
+                                 gulong      *microseconds);
 
-void    g_usleep        (gulong    microseconds);
+GLIB_AVAILABLE_IN_ALL
+void     g_usleep                (gulong       microseconds);
 
-void    g_time_val_add  (GTimeVal *time, 
-                         glong     microseconds);
+GLIB_AVAILABLE_IN_ALL
+void     g_time_val_add          (GTimeVal    *time_, 
+                                  glong        microseconds);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_time_val_from_iso8601 (const gchar *iso_date,
+                                 GTimeVal    *time_);
+GLIB_AVAILABLE_IN_ALL
+gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
 
 G_END_DECLS