Fix printf-tests on W32 by ifdefing the expected output

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

diff --git a/glib/gshell.h b/glib/gshell.h
index 0f7fd1f..cff6c5c 100644 (file)
--- a/glib/gshell.h
+++ b/glib/gshell.h
@@ -18,16 +18,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GSHELL_H__
-#define __GSHELL_H__
+#ifndef __G_SHELL_H__
+#define __G_SHELL_H__
 
-#include <gerror.h>
-
-#ifdef __cplusplus
-extern "C"
-{
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
 #endif
 
+#include <glib/gerror.h>
+
+G_BEGIN_DECLS
+
 #define G_SHELL_ERROR g_shell_error_quark ()
 
 typedef enum
@@ -39,21 +40,20 @@ typedef enum
   G_SHELL_ERROR_FAILED
 } GShellError;
 
+GLIB_AVAILABLE_IN_ALL
 GQuark g_shell_error_quark (void);
 
+GLIB_AVAILABLE_IN_ALL
 gchar*   g_shell_quote      (const gchar   *unquoted_string);
+GLIB_AVAILABLE_IN_ALL
 gchar*   g_shell_unquote    (const gchar   *quoted_string,
                              GError       **error);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_shell_parse_argv (const gchar   *command_line,
-                             gint          *argc,
-                             gchar       ***argv,
+                             gint          *argcp,
+                             gchar       ***argvp,
                              GError       **error);
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GSHELL_H__ */
-
-
+#endif /* __G_SHELL_H__ */