Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_esp_pthread_h_compatible_with_cpp' into 'mas…
Browse files Browse the repository at this point in the history
…ter'

pthread: fix esp_pthread.h to compatible with c++

See merge request idf/esp-idf!2739
  • Loading branch information
igrr committed Jul 12, 2018
2 parents 04caff2 + 5c6e1e6 commit b0c049a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions components/pthread/include/esp_pthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#pragma once

#ifdef __cplusplus
extern "C" {
#endif

#include <pthread.h>

/** pthread configuration structure that influences pthread creation */
Expand Down Expand Up @@ -55,3 +62,6 @@ esp_err_t esp_pthread_set_cfg(const esp_pthread_cfg_t *cfg);
*/
esp_err_t esp_pthread_get_cfg(esp_pthread_cfg_t *p);

#ifdef __cplusplus
}
#endif

0 comments on commit b0c049a

Please sign in to comment.