Changeset 339 for trunk/openjdk/jdk


Ignore:
Timestamp:
Feb 28, 2012, 7:49:15 PM (13 years ago)
Author:
dmik
Message:

Switch JNI calling convention from stdcall to _System on OS/2.

This makes JNI DLLs to be compatible with IBM Java (which uses
the _System cconv) and fixes applications using such DLLs (like
the standard LVMGUI and TCP/IP configuration OS/2 tools
written in Java).

Location:
trunk/openjdk/jdk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/java/hpi/windows/Makefile

    r278 r339  
    7272        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    7373        @$(ECHO) 'EXPORTS \n \
    74   DLL_Initialize = "_DLL_Initialize@8" \n \
     74  DLL_Initialize \n \
    7575' >> $@
    7676

  • trunk/openjdk/jdk/make/java/instrument/Makefile

    r278 r339  
    130130        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    131131        @$(ECHO) 'EXPORTS \n \
    132   Agent_OnAttach = "_Agent_OnAttach@12" \n \
     132  Agent_OnAttach \n \
    133133' >> $@
    134134clean::

  • trunk/openjdk/jdk/make/java/npt/Makefile

    r278 r339  
    7777        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    7878        @$(ECHO) 'EXPORTS \n \
    79   nptInitialize = "_nptInitialize@12" \n \
    80   nptTerminate = "_nptTerminate@8" \n \
     79  nptInitialize \n \
     80  nptTerminate \n \
    8181' >> $@
    8282

  • trunk/openjdk/jdk/make/java/zip/Makefile

    r278 r339  
    8181        @$(ECHO) 'EXPORTS \n \
    8282  ZIP_CRC32 = _ZIP_CRC32 \n \
    83   ZIP_Open = "_ZIP_Open@8" \n \
    84   ZIP_Close = "_ZIP_Close@4" \n \
    85   ZIP_FindEntry = "_ZIP_FindEntry@16" \n \
    86   ZIP_ReadEntry = "_ZIP_ReadEntry@16" \n \
    87   ZIP_GetNextEntry = "_ZIP_GetNextEntry@8" \n \
     83  ZIP_Open \n \
     84  ZIP_Close \n \
     85  ZIP_FindEntry \n \
     86  ZIP_ReadEntry \n \
     87  ZIP_GetNextEntry \n \
    8888' >> $@
    8989clean::

  • trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

    r278 r339  
    8585        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    8686        @$(ECHO) 'EXPORTS \n \
    87   jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
     87  jdwpTransport_OnLoad \n \
    8888' >> $@
    8989

  • trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

    r278 r339  
    9999        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    100100        @$(ECHO) 'EXPORTS \n \
    101   jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
     101  jdwpTransport_OnLoad \n \
    102102' >> $@
    103103

  • trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h

    r329 r339  
    2929#define JNIEXPORT __declspec(dllexport)
    3030#define JNIIMPORT __declspec(dllimport)
     31
     32#ifdef __OS2__
     33#define JNICALL _System
     34#else
    3135#define JNICALL __stdcall
     36#endif
    3237
    3338#ifdef __GNUC__
Note: See TracChangeset for help on using the changeset viewer.