| OLD | NEW |
|---|
| 1 diff --git a/Makefile.am b/Makefile.am | 1 diff --git a/Makefile.am b/Makefile.am |
| 2 --- a/Makefile.am | 2 --- a/Makefile.am |
| 3 +++ b/Makefile.am | 3 +++ b/Makefile.am |
| 4 @@ -2,7 +2,7 @@ | 4 @@ -2,7 +2,7 @@ |
| 5 include $(top_srcdir)/Makefile.decl | 5 include $(top_srcdir)/Makefile.decl |
| 6 | 6 |
| 7 SRC_SUBDIRS = gdk gtk modules demos tests perf | 7 SRC_SUBDIRS = gdk gtk modules demos tests perf |
| 8 -SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build | 8 -SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build |
| 9 +SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build | 9 +SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build |
| 10 | 10 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 _gtk_marshal_OBJECT__VOID (GClosure *closure, | 47 _gtk_marshal_OBJECT__VOID (GClosure *closure, |
| 48 GValue *return_value G_GNUC_UNUSED, | 48 GValue *return_value G_GNUC_UNUSED, |
| 49 @@ -85,6 +86,7 @@ _gtk_marshal_OBJECT__VOID (GClosure *closure, | 49 @@ -85,6 +86,7 @@ _gtk_marshal_OBJECT__VOID (GClosure *closure, |
| 50 | 50 |
| 51 g_value_take_object (return_value, v_return); | 51 g_value_take_object (return_value, v_return); |
| 52 } | 52 } |
| 53 +#endif | 53 +#endif |
| 54 | 54 |
| 55 /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */ | 55 /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */ |
| 56 void | 56 void |
| 57 diff --git a/tests/autotestkeywords.cc b/tests/autotestkeywords.cc | |
| 58 --- a/tests/autotestkeywords.cc | |
| 59 +++ b/tests/autotestkeywords.cc | |
| 60 @@ -36,4 +36,8 @@ | |
| 61 #undef GDK_ROOT_WINDOW | |
| 62 #endif | |
| 63 | |
| 64 +#ifdef __native_client__ | |
| 65 +extern "C" int nacl_main(); | |
| 66 +#endif | |
| 67 + | |
| 68 int main() { return 0; } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1417223003:
Switch from using 'nacl_main' to 'main' entry point (Closed)
Base URL: https://chromium.googlesource.com/external/naclports.git@master