unicode: Switch compose_second_single to gunichar

[platform/upstream/glib.git] / glib / gnulib / printf-args.h

diff --git a/glib/gnulib/printf-args.h b/glib/gnulib/printf-args.h
index 35114a8..250ce7e 100644 (file)
--- a/glib/gnulib/printf-args.h
+++ b/glib/gnulib/printf-args.h
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
@@ -49,6 +47,10 @@ typedef enum
   TYPE_LONGLONGINT,
   TYPE_ULONGLONGINT,
 #endif
+#ifdef HAVE_INT64_AND_I64
+  TYPE_INT64,
+  TYPE_UINT64,
+#endif
   TYPE_DOUBLE,
 #ifdef HAVE_LONG_DOUBLE
   TYPE_LONGDOUBLE,
@@ -89,6 +91,10 @@ typedef struct
     long long int              a_longlongint;
     unsigned long long int     a_ulonglongint;
 #endif
+#ifdef HAVE_INT64_AND_I64
+    __int64                     a_int64;
+    unsigned __int64            a_uint64;
+#endif
     float                      a_float;
     double                     a_double;
 #ifdef HAVE_LONG_DOUBLE