Changeset 254


Ignore:
Timestamp:
Feb 9, 2011, 9:06:13 PM (15 years ago)
Author:
dmik
Message:

jdk/jsound: Using extern "C" around headers is plain wrong.

Location:
trunk/openjdk/jdk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/src/share/native/com/sun/media/sound/DirectAudio.h

    r2 r254  
    5757#if (USE_DAUDIO == TRUE)
    5858
     59#ifdef __cplusplus
     60extern "C" {
     61#endif
     62
    5963// callback from GetFormats, implemented in DirectAudioDevice.c
    6064void DAUDIO_AddAudioFormat(void* creator, int significantBits, int frameSizeInBytes,
    … …  
    98102void DAUDIO_Service(void* id, int isSource);
    99103
     104#ifdef __cplusplus
     105} /* extern "C" */
     106#endif
     107
    100108#endif // USE_DAUDIO
    101109

  • trunk/openjdk/jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp

    r2 r254  
    4444#include <dsound.h>
    4545
    46 /* include Java Sound specific headers as C code */
    47 #ifdef __cplusplus
    48 extern "C" {
    49 #endif
    50  #include "DirectAudio.h"
    51 #ifdef __cplusplus
    52 }
    53 #endif
     46/* include Java Sound specific headers */
     47#include "DirectAudio.h"
    5448
    5549#ifdef USE_DEBUG_SILENCING
Note: See TracChangeset for help on using the changeset viewer.