projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "gatomic: statically assert that our assumptions hold"
[platform/upstream/glib.git]
/
glib
/
gtimezone.h
diff --git
a/glib/gtimezone.h
b/glib/gtimezone.h
index
8bc6684
..
3e6f1cb
100644
(file)
--- a/
glib/gtimezone.h
+++ b/
glib/gtimezone.h
@@
-12,20
+12,18
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* 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/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
#ifndef __G_TIME_ZONE_H__
#define __G_TIME_ZONE_H__
#ifndef __G_TIME_ZONE_H__
#define __G_TIME_ZONE_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
#include <glib/gtypes.h>
G_BEGIN_DECLS
@@
-54,25
+52,35
@@
typedef enum
G_TIME_TYPE_UNIVERSAL
} GTimeType;
G_TIME_TYPE_UNIVERSAL
} GTimeType;
+GLIB_AVAILABLE_IN_ALL
GTimeZone * g_time_zone_new (const gchar *identifier);
GTimeZone * g_time_zone_new (const gchar *identifier);
+GLIB_AVAILABLE_IN_ALL
GTimeZone * g_time_zone_new_utc (void);
GTimeZone * g_time_zone_new_utc (void);
+GLIB_AVAILABLE_IN_ALL
GTimeZone * g_time_zone_new_local (void);
GTimeZone * g_time_zone_new_local (void);
+GLIB_AVAILABLE_IN_ALL
GTimeZone * g_time_zone_ref (GTimeZone *tz);
GTimeZone * g_time_zone_ref (GTimeZone *tz);
+GLIB_AVAILABLE_IN_ALL
void g_time_zone_unref (GTimeZone *tz);
void g_time_zone_unref (GTimeZone *tz);
+GLIB_AVAILABLE_IN_ALL
gint g_time_zone_find_interval (GTimeZone *tz,
GTimeType type,
gint g_time_zone_find_interval (GTimeZone *tz,
GTimeType type,
- gint64 time);
+ gint64 time
_
);
+GLIB_AVAILABLE_IN_ALL
gint g_time_zone_adjust_time (GTimeZone *tz,
GTimeType type,
gint g_time_zone_adjust_time (GTimeZone *tz,
GTimeType type,
- gint64 *time);
+ gint64 *time
_
);
+GLIB_AVAILABLE_IN_ALL
const gchar * g_time_zone_get_abbreviation (GTimeZone *tz,
gint interval);
const gchar * g_time_zone_get_abbreviation (GTimeZone *tz,
gint interval);
+GLIB_AVAILABLE_IN_ALL
gint32 g_time_zone_get_offset (GTimeZone *tz,
gint interval);
gint32 g_time_zone_get_offset (GTimeZone *tz,
gint interval);
+GLIB_AVAILABLE_IN_ALL
gboolean g_time_zone_is_dst (GTimeZone *tz,
gint interval);
gboolean g_time_zone_is_dst (GTimeZone *tz,
gint interval);