ChangeLog for previous patch: regenerate intl-auto-encap-win32.c (fix build problems when building --with-msw=no on Cygwin) -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-01-15 Ben Wing <ben@xemacs.org> * make-mswin-unicode.pl: Various fixes to get this to work when using the Cygwin header files in /usr/include/w32api instead of the VC++ ones: -- Use /usr/include/w32api as default; don't assume that a passed-in directory always ends in .../include. -- Add `const' to list of known type modifiers. -- If function already seen, warn but don't generate twice. -- Eliminate `extern' from return type modifiers. -- Cosmetic: When eliminating APIENTRY, also eliminate following whitespace. src/ChangeLog addition: 2010-01-15 Ben Wing <ben@xemacs.org> * intl-auto-encap-win32.c: * intl-auto-encap-win32.c (qxeExtractAssociatedIcon): * intl-auto-encap-win32.c (qxeShellExecuteEx): * intl-auto-encap-win32.c (qxeSHFileOperation): * intl-auto-encap-win32.c (qxeSHQueryRecycleBin): * intl-auto-encap-win32.c (qxeSHEmptyRecycleBin): * intl-auto-encap-win32.c (qxeWNetAddConnection): * intl-auto-encap-win32.c (qxeWNetAddConnection2): * intl-auto-encap-win32.c (qxeWNetAddConnection3): * intl-auto-encap-win32.c (qxeWNetCancelConnection): * intl-auto-encap-win32.c (qxeWNetCancelConnection2): * intl-auto-encap-win32.c (qxeWNetGetConnection): * intl-auto-encap-win32.c (qxeWNetUseConnection): * intl-auto-encap-win32.c (qxeWNetConnectionDialog1): * intl-auto-encap-win32.c (qxeWNetDisconnectDialog1): * intl-auto-encap-win32.c (qxeWNetOpenEnum): * intl-auto-encap-win32.c (qxeWNetEnumResource): * intl-auto-encap-win32.c (qxeWNetGetUniversalName): * intl-auto-encap-win32.c (qxeWNetGetUser): * intl-auto-encap-win32.c (qxeWNetGetProviderName): * intl-auto-encap-win32.c (qxeWNetGetNetworkInformation): * intl-auto-encap-win32.c (qxeWNetGetLastError): * intl-auto-encap-win32.c (qxeMultinetGetConnectionPerformance): * intl-auto-encap-win32.c (qxeAppendMenu): * intl-auto-encap-win32.c (qxeCopyAcceleratorTable): * intl-auto-encap-win32.c (qxeDlgDirSelectComboBoxEx): * intl-auto-encap-win32.c (qxeEnumDesktops): * intl-auto-encap-win32.c (qxeEnumWindowStations): * intl-auto-encap-win32.c (qxeGetClassInfo): * intl-auto-encap-win32.c (qxeGetClassLong): * intl-auto-encap-win32.c (qxeGetClassName): * intl-auto-encap-win32.c (qxeGetKeyboardLayoutName): * intl-auto-encap-win32.c (qxeGetWindowLong): * intl-auto-encap-win32.c (qxeGetUserObjectInformation): * intl-auto-encap-win32.c (qxeGetWindowTextLength): * intl-auto-encap-win32.c (qxeGrayString): * intl-auto-encap-win32.c (qxeInsertMenu): * intl-auto-encap-win32.c (qxeSetProp): * intl-auto-encap-win32.c (qxeEnumICMProfiles): * intl-auto-encap-win32.c (qxeExtTextOut): * intl-auto-encap-win32.c (qxeSetICMProfile): * intl-auto-encap-win32.c (qxeTextOut): * intl-auto-encap-win32.c (qxeSHGetPathFromIDList): * intl-auto-encap-win32.c (qxeFindText): * intl-auto-encap-win32.c (qxeReplaceText): * intl-auto-encap-win32.c (qxeImmInstallIME): * intl-auto-encap-win32.c (qxeImmGetDescription): * intl-auto-encap-win32.c (qxeImmGetIMEFileName): * intl-auto-encap-win32.c (qxeImmGetCompositionString): * intl-auto-encap-win32.c (qxeImmGetCandidateListCount): * intl-auto-encap-win32.c (qxeImmGetCandidateList): * intl-auto-encap-win32.c (qxeImmGetGuideLine): * intl-auto-encap-win32.c (qxeImmConfigureIME): * intl-auto-encap-win32.c (qxeImmEscape): * intl-auto-encap-win32.c (qxeImmGetConversionList): * intl-auto-encap-win32.c (qxeImmRegisterWord): * intl-auto-encap-win32.c (qxeImmUnregisterWord): * intl-auto-encap-win32.c (qxeImmEnumRegisterWord): * intl-auto-encap-win32.c (qxesndPlaySound): * intl-auto-encap-win32.c (qxePlaySound): * intl-auto-encap-win32.c (qxewaveOutGetErrorText): * intl-auto-encap-win32.c (qxewaveInGetErrorText): * intl-auto-encap-win32.c (qxemidiOutGetErrorText): * intl-auto-encap-win32.c (qxemidiInGetErrorText): * intl-auto-encap-win32.c (qxemmioStringToFOURCC): * intl-auto-encap-win32.c (qxemmioInstallIOProc): * intl-auto-encap-win32.c (qxemmioOpen): * intl-auto-encap-win32.c (qxemmioRename): * intl-auto-encap-win32.c (qxemciSendCommand): * intl-auto-encap-win32.c (qxemciSendString): * intl-auto-encap-win32.c (qxemciGetDeviceID): * intl-auto-encap-win32.c (qxemciGetErrorString): * intl-auto-encap-win32.h: * intl-auto-encap-win32.h (qxemciGetErrorString): Regenerate these files from Cygwin headers. * intl-encap-win32.c: Bracket more functions in HAVE_MS_WINDOWS, to fix build problems when building --with-msw=no on Cygwin. Fixes for Cygwin headers: -- Comment out IME.H, non-existent in Cygwin. -- Make MessageBoxIndirect a `no' (don't encapsulate but generate error if used) because it has a structure parameter that needs to be A/W split but is declared as FOO*, and our parser can't split this.

+
−/*
+
− * Copyright (c) 2000, Red Hat, Inc.
+
− *
+
− *     This program is free software; you can redistribute it and/or modify
+
− *     it under the terms of the GNU General Public License as published by
+
− *     the Free Software Foundation; either version 2 of the License, or
+
− *     (at your option) any later version.
+
− *
+
− *     A copy of the GNU General Public License can be found at
+
− *     http://www.gnu.org/
+
− *
+
− * Written by DJ Delorie <dj@cygnus.com>
+
− *
+
− */
+
−
+
−/* Simple hash class for install.cc */
+
−
+
−#include "win32.h"
+
−#include <stdlib.h>
+
−#include <string.h>
+
−
+
−#include "hash.h"
+
−
+
−class hash_internals {
+
−public:
+
−  char **keys;
+
−  int numkeys;
+
−  int maxkeys;
+
−  int prev_index;
+
−};
+
−
+
−hash::hash ()
+
−{
+
−  h = new hash_internals;
+
−  h->numkeys = 0;
+
−  h->maxkeys = 10;
+
−  h->keys = (char **) malloc (h->maxkeys * sizeof (char *));
+
−  h->prev_index = 0;
+
−}
+
−
+
−hash::~hash ()
+
−{
+
−  free (h->keys);
+
−  free (h);
+
−}
+
−
+
−
+
−void
+
−hash::add (char *string)
+
−{
+
−  int i;
+
−  for (i=0; i<h->numkeys; i++)
+
−    if (strcmp (h->keys[i], string) == 0)
+
−      return;
+
−  if (h->numkeys >= h->maxkeys)
+
−    {
+
−      h->maxkeys += 10;
+
−      h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *));
+
−    }
+
−
+
−  h->keys[h->numkeys] = _strdup (string);
+
−  h->numkeys ++;
+
−}
+
−
+
−
+
−int
+
−hash::has (char *string)
+
−{
+
−  int i;
+
−  for (i=0; i<h->numkeys; i++)
+
−    if (strcmp (h->keys[i], string) == 0)
+
−      return 1;
+
−  return 0;
+
−}
+
−
+
−char *
+
−hash::enumerate (char *prev)
+
−{
+
−  if (prev == 0)
+
−    h->prev_index = -1;
+
−  h->prev_index ++;
+
−  if (h->prev_index >= h->numkeys)
+
−    return 0;
+
−  return h->keys[h->prev_index];
+
−}
+
−
+
−static int CDECL
+
−rev_len (const void *va, const void *vb)
+
−{
+
−  char *a = *(char **)va;
+
−  char *b = *(char **)vb;
+
−  return strcmp (b, a);
+
−}
+
−
+
−void
+
−hash::reverse_sort ()
+
−{
+
−  qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len);
+
−}