From owner-p4-projects Sun Dec 8 13:53:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28C7237B404; Sun, 8 Dec 2002 13:53:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5CBE37B401 for ; Sun, 8 Dec 2002 13:53:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DD0C43EA9 for ; Sun, 8 Dec 2002 13:53:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gB8LmfmV063016 for ; Sun, 8 Dec 2002 13:48:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gB8Lmeh9063013 for perforce@freebsd.org; Sun, 8 Dec 2002 13:48:40 -0800 (PST) Date: Sun, 8 Dec 2002 13:48:40 -0800 (PST) Message-Id: <200212082148.gB8Lmeh9063013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22078 Change 22078 by marcel@marcel_nfs on 2002/12/08 13:47:57 Change the prototype of main to: EFI_STATUS main(int argc, CHAR16 *argv[]); Add the prototype to efilib.h. That way the compiler will complain if main is defined differently. While in efilib.h, rename efi_init to efi_main and add a prototype for exit. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efilib.h#3 edit .. //depot/projects/ia64/sys/boot/efi/loader/main.c#11 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -32,4 +32,7 @@ extern EFI_RUNTIME_SERVICES *RS; void *efi_get_table(EFI_GUID *tbl); -void efi_init(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); +void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); + +EFI_STATUS main(int argc, CHAR16 *argv[]); +void exit(EFI_STATUS status); ==== //depot/projects/ia64/sys/boot/efi/loader/main.c#11 (text+ko) ==== @@ -99,7 +99,7 @@ } EFI_STATUS -main(int argc, char *argv) +main(int argc, CHAR16 *argv[]) { EFI_LOADED_IMAGE *img; EFI_SIMPLE_NETWORK *net; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message