Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: third_party/harfbuzz-ng/src/hb-private.hh

Issue 481653002: Fix harfbuzz compile on Windows LKGRs after r290100 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/harfbuzz-ng/google.patch ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright © 2007,2008,2009 Red Hat, Inc. 2 * Copyright © 2007,2008,2009 Red Hat, Inc.
3 * Copyright © 2011,2012 Google, Inc. 3 * Copyright © 2011,2012 Google, Inc.
4 * 4 *
5 * This is part of HarfBuzz, a text shaping library. 5 * This is part of HarfBuzz, a text shaping library.
6 * 6 *
7 * Permission is hereby granted, without written agreement and without 7 * Permission is hereby granted, without written agreement and without
8 * license or royalty fees, to use, copy, modify, and distribute this 8 * license or royalty fees, to use, copy, modify, and distribute this
9 * software and its documentation for any purpose, provided that the 9 * software and its documentation for any purpose, provided that the
10 * above copyright notice and the following two paragraphs appear in 10 * above copyright notice and the following two paragraphs appear in
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 * though we run on it fine. */ 124 * though we run on it fine. */
125 # if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 125 # if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
126 # undef _WIN32_WINNT 126 # undef _WIN32_WINNT
127 # endif 127 # endif
128 # ifndef _WIN32_WINNT 128 # ifndef _WIN32_WINNT
129 # define _WIN32_WINNT 0x0600 129 # define _WIN32_WINNT 0x0600
130 # endif 130 # endif
131 # ifndef WIN32_LEAN_AND_MEAN 131 # ifndef WIN32_LEAN_AND_MEAN
132 # define WIN32_LEAN_AND_MEAN 132 # define WIN32_LEAN_AND_MEAN
133 # endif 133 # endif
134 # define STRICT 134 # ifndef STRICT
135 # define STRICT
136 # endif
135 #endif 137 #endif
136 138
137 #ifdef _WIN32_WCE 139 #ifdef _WIN32_WCE
138 /* Some things not defined on Windows CE. */ 140 /* Some things not defined on Windows CE. */
139 #define MemoryBarrier() 141 #define MemoryBarrier()
140 #define getenv(Name) NULL 142 #define getenv(Name) NULL
141 #define setlocale(Category, Locale) "C" 143 #define setlocale(Category, Locale) "C"
142 static int errno = 0; /* Use something better? */ 144 static int errno = 0; /* Use something better? */
143 #endif 145 #endif
144 146
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 hb_options (void) 970 hb_options (void)
969 { 971 {
970 if (unlikely (!_hb_options.i)) 972 if (unlikely (!_hb_options.i))
971 _hb_options_init (); 973 _hb_options_init ();
972 974
973 return _hb_options.opts; 975 return _hb_options.opts;
974 } 976 }
975 977
976 978
977 #endif /* HB_PRIVATE_HH */ 979 #endif /* HB_PRIVATE_HH */
OLDNEW
« no previous file with comments | « third_party/harfbuzz-ng/google.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698