Pavel Chupin
20aa6c0f4c
Workaround g++ 4.7 compfail
...
error: C99 designator 'name' outside aggregate initializer
G++ 4.7+ can't handle some of C99 designated initializers.
Most likely it's just not implemented yet. Other possible workarounds is
to compile this as C not C++ or define name as char* instead of char[SIZE].
Appeared after this change https://android-review.googlesource.com/#/c/44470
Change-Id: Ib28157848ce759b8bb5dbb2ac0d9a768fa4e5107
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-10-25 17:58:45 +04:00
Elliott Hughes
4cdc426207
am 60c7ac26
: am d0f2b7e7
: Merge "More upstream NetBSD upgrades."
...
* commit '60c7ac262241588f7942ca068f33d706c8fe5cc4':
More upstream NetBSD upgrades.
2012-10-23 17:29:47 -07:00
Elliott Hughes
60c7ac2622
am d0f2b7e7
: Merge "More upstream NetBSD upgrades."
...
* commit 'd0f2b7e7e65f19f978c59abcbb522c08e76b1508':
More upstream NetBSD upgrades.
2012-10-23 17:15:07 -07:00
Elliott Hughes
d0f2b7e7e6
Merge "More upstream NetBSD upgrades."
2012-10-23 16:55:19 -07:00
Elliott Hughes
ab44f52202
More upstream NetBSD upgrades.
...
Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-23 16:05:09 -07:00
Elliott Hughes
217e616772
am 45f07555
: am e3dbe1e3
: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit '45f075556b26cfe91b1b7e1299b54f0328a06acb':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:58:25 -07:00
Elliott Hughes
45f075556b
am e3dbe1e3
: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit 'e3dbe1e3820d6ab0370566055e9cdc593c5cce48':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:55:59 -07:00
Elliott Hughes
e3dbe1e382
Merge "Upgrade more functions to the current upstream NetBSD copy."
2012-10-23 13:45:37 -07:00
Elliott Hughes
e8bcca3a2c
Upgrade more functions to the current upstream NetBSD copy.
...
Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 12:29:53 -07:00
Elliott Hughes
1d212fa6eb
am 4280143d
: am fb93e6a5
: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit '4280143d371eae2123a5d8c4d8779db159ecd1e2':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:08:54 -07:00
Elliott Hughes
4280143d37
am fb93e6a5
: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit 'fb93e6a5b322a87e61de19421a72d6dfcc82b614':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:06:55 -07:00
Elliott Hughes
fb93e6a5b3
Merge "Move setlocale(3) and the wchar stubs over to .cpp."
2012-10-22 17:50:27 -07:00
Elliott Hughes
29c7f0b4d1
Move setlocale(3) and the wchar stubs over to .cpp.
...
Also separate out the C++ files so we can use -Werror on them. I'd
rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us
see which files still need to be sorted into one bucket or the other.
Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-22 17:05:27 -07:00
Elliott Hughes
1d8b87d2b4
am 69ec117b
: am 5a9911e9
: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '69ec117b22e3e842bff15f54f3e777cdf3206d21':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:31:29 -07:00
Elliott Hughes
c866dc20bf
am 9d5a96c0
: am 574773b1
: Merge "Clean up warnings in stubs.cpp."
...
* commit '9d5a96c0d9583fe9a02190ba54a855a2dcc87eb9':
Clean up warnings in stubs.cpp.
2012-10-22 16:31:28 -07:00
Elliott Hughes
69ec117b22
am 5a9911e9
: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '5a9911e94086a15a7f2d5a7c9173847f123a46ea':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:29:13 -07:00
Elliott Hughes
9d5a96c0d9
am 574773b1
: Merge "Clean up warnings in stubs.cpp."
...
* commit '574773b1eae797e2f7a1d11d0176755d2e74eb41':
Clean up warnings in stubs.cpp.
2012-10-22 16:29:12 -07:00
Elliott Hughes
5a9911e940
Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
2012-10-22 16:13:04 -07:00
Elliott Hughes
574773b1ea
Merge "Clean up warnings in stubs.cpp."
2012-10-22 16:12:47 -07:00
Elliott Hughes
ce45fea03d
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
...
Change-Id: I35ceb09fedf873c5e98e1e26efce5e4f00a17e74
2012-10-22 16:10:27 -07:00
Elliott Hughes
6fa26e21bc
Clean up warnings in stubs.cpp.
...
Change-Id: Ie0792846de7cf5f5c72737494bf78ab8dcb8cc3e
2012-10-22 16:04:56 -07:00
Elliott Hughes
8b8cc88d39
am 75f33adc
: am 4e457759
: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '75f33adcb1f845ae121eb5508b120aaaa9f7a217':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 16:00:03 -07:00
Elliott Hughes
75f33adcb1
am 4e457759
: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '4e457759893a6a6ab4f84a5aea231d0a11c7bb13':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 15:57:42 -07:00
Elliott Hughes
4e45775989
Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
2012-10-22 15:51:12 -07:00
Elliott Hughes
4035b7a321
Move the FORTIFY_SOURCE helpers over to .cpp.
...
Change-Id: Ib5067d51b983cac7760c975becce7fe2408ead04
2012-10-22 15:32:01 -07:00
Elliott Hughes
3135c87ca8
am 008744ce
: am df92635a
: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit '008744cedaa7e3be533bbedb51dd986c6dfea987':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:11:07 -07:00
Elliott Hughes
008744ceda
am df92635a
: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit 'df92635a57e8093d9cbffc38bbf513f3361ee91e':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:08:38 -07:00
Elliott Hughes
df92635a57
Merge "Support zone.tab in bionic, and remove the file format version."
2012-10-22 14:56:32 -07:00
Elliott Hughes
2393535f0d
Support zone.tab in bionic, and remove the file format version.
...
Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
2012-10-22 14:47:58 -07:00
Elliott Hughes
9407c5c126
am 417834b1
: am eb370aa3
: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit '417834b17ee00a6b1cd4e816f632c3596f3f51c3':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:55:42 -07:00
Elliott Hughes
417834b17e
am eb370aa3
: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit 'eb370aa31dd549ad7a7a2044dedab1140a7aeda9':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:53:22 -07:00
Elliott Hughes
eb370aa31d
Merge "Make bionic look in /data/misc for tzdata updates."
2012-10-22 11:37:26 -07:00
Elliott Hughes
1c29572034
Make bionic look in /data/misc for tzdata updates.
...
Bug: 7012465
Change-Id: I4d1018f686f2409600fdb6630732cae33efe8f02
2012-10-22 11:34:05 -07:00
Elliott Hughes
1b62d4e72e
am 629a28cd
: am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit '629a28cdf384d83a4d433de8e1299b01e42cc75e':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:24:22 -07:00
Elliott Hughes
421083359e
am 58d08711
: am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '58d08711af5e8237d6196652d59cc4e8b8caafcf':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:24:21 -07:00
Elliott Hughes
629a28cdf3
am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit 'dc595d830898e5859bf98d7436af2a777a11f810':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:21:41 -07:00
Elliott Hughes
58d08711af
am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:21:40 -07:00
Elliott Hughes
dc595d8308
Merge "Change ZoneCompator to generate the single "tzdata" file."
2012-10-19 17:12:37 -07:00
Elliott Hughes
7a85c42b8f
Merge "Update generate-NOTICE.py to know about tzdata."
2012-10-19 17:07:46 -07:00
The Android Automerger
5ba74660e3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 15:45:58 -07:00
Elliott Hughes
5b1497acdb
Change ZoneCompator to generate the single "tzdata" file.
...
Also remove the obsolete individual files, and the temporary script
that converted between the formats.
Bug: 7012465
Change-Id: I5a4030098e4d53e747fd6d395df2679d1567ee1f
2012-10-19 15:45:46 -07:00
Elliott Hughes
4612763b44
Update generate-NOTICE.py to know about tzdata.
...
Also regenerate the NOTICE files. One had slipped behind.
Bug: 7012465
Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a
2012-10-19 14:55:19 -07:00
Elliott Hughes
933746ad7d
am af72df5b
: am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'af72df5b98944cfb89cecb7abc05bceec0612981':
Track the tzdata2012g update in the new file format.
2012-10-19 14:42:05 -07:00
Elliott Hughes
af72df5b98
am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'e75c273ac434043153f22b1c2f89c042928407bc':
Track the tzdata2012g update in the new file format.
2012-10-19 14:40:25 -07:00
Elliott Hughes
e75c273ac4
Merge "Track the tzdata2012g update in the new file format."
2012-10-19 14:30:05 -07:00
Elliott Hughes
8af5412efc
Track the tzdata2012g update in the new file format.
...
Change-Id: Id18aeb1122df769d83c4be06fbf37681231e79f0
2012-10-19 14:28:56 -07:00
Elliott Hughes
bde97cf154
am 98533cfa
: am 88cd1a21
: Merge "Upgrade to tzdata2012g."
...
* commit '98533cfa4b69d053e111e46bc74d8e9b2035a96e':
Upgrade to tzdata2012g.
2012-10-19 13:53:21 -07:00
Elliott Hughes
18ee86f892
am f0af78c2
: am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit 'f0af78c27bede71304a894c23fb3100d027fc74b':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:53:20 -07:00
Elliott Hughes
98533cfa4b
am 88cd1a21
: Merge "Upgrade to tzdata2012g."
...
* commit '88cd1a2188cde62d9f94881549791b7c197b2116':
Upgrade to tzdata2012g.
2012-10-19 13:51:19 -07:00
Elliott Hughes
f0af78c27b
am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit '551ca77e35098272abfe9484457827c661d23ef0':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:51:18 -07:00